v1.3.3 (#107)

Author: frf12

_cmd.py

@@ -659,11 +659,25 @@ def _do_command(self, obd):
             return self._show_help()
 
 
+class ClusterChangeRepositoryCommand(ClusterMirrorCommand):
+
+    def __init__(self):
+        super(ClusterChangeRepositoryCommand, self).__init__('change-repo', 'Change repository for a deployed component')
+        self.parser.add_option('-c', '--component', type='string', help="Component name to change repository.")
+        self.parser.add_option('--hash', type='string', help="Repository's hash")
+        self.parser.add_option('-f', '--force', action='store_true', help="force change even start failed.")
+
+    def _do_command(self, obd):
+        if self.cmds:
+            return obd.change_repository(self.cmds[0], self.opts)
+        else:
+            return self._show_help()
+
+
 class CLusterUpgradeCommand(ClusterMirrorCommand):
 
     def __init__(self):
         super(CLusterUpgradeCommand, self).__init__('upgrade', 'Upgrade a cluster.')
-        self.parser.add_option('-f', '--force', action='store_true', help="Force upgrade.")
         self.parser.add_option('-c', '--component', type='string', help="Component name to upgrade.")
         self.parser.add_option('-V', '--version', type='string', help="Target version.")
         self.parser.add_option('--skip-check', action='store_true', help="Skip all the possible checks.")
@@ -748,6 +762,7 @@ def __init__(self):
         self.register_command(ClusterEditConfigCommand())
         self.register_command(ClusterReloadCommand())
         self.register_command(CLusterUpgradeCommand())
+        self.register_command(ClusterChangeRepositoryCommand())
         self.register_command(ClusterTenantCommand())
 
 

_deploy.py

@@ -984,18 +984,18 @@ def update_upgrade_ctx(self, **uprade_ctx):
         self._uprade_meta = uprade_meta
         return False
 
-    def _update_component_repository(self, component, repository):
-        if not self.deploy_config.update_component_package_hash(component, repository.hash, repository.version):
+    def update_component_repository(self, repository):
+        if not self.deploy_config.update_component_package_hash(repository.name, repository.hash, repository.version):
             return False
-        self.use_model(component, repository)
+        self.use_model(repository.name, repository)
         return True
 
     def stop_upgrade(self, dest_repository=None):
         if self._update_deploy_status(DeployStatus.STATUS_RUNNING):
             self._uprade_meta = None
             self._dump_upgrade_meta_data()
             if dest_repository:
-                self._update_component_repository(dest_repository.name, dest_repository)
+                self.update_component_repository(dest_repository)
             return True
         return False
 

_mirror.py

@@ -112,6 +112,13 @@ def get_exact_pkg(self, **pattern):
         info = self.get_exact_pkg_info(**pattern)
         return self.get_rpm_pkg_by_info(info) if info else None
 
+    def _pattern_check(self, pkg, **pattern):
+        for key in ['md5', 'name', 'version', 'release', 'arch']:
+            if pattern.get(key) is not None and getattr(pkg, key) != pattern[key]:
+                self.stdio and getattr(self.stdio, 'verbose', print)('pkg %s is %s, but %s is required' % (key, getattr(pkg, key), pattern[key]))
+                return None
+        return pkg
+            
     def get_rpm_pkg_by_info(self, pkg_info):
         return None
 
@@ -428,14 +435,14 @@ def get_repomds(self, update=False):
     def get_all_pkg_info(self):
         return [self.db[key] for key in self.db]
 
-    def get_rpm_info_by_md5(self, md5):
+    def get_rpm_info_by_md5(self, md5, **pattern):
         if md5 in self.db:
-            return self.db[md5]
+            return self._pattern_check(self.db[md5], **pattern)
         for key in self.db:
             info = self.db[key]
             if info.md5 == md5:
                 self.stdio and getattr(self.stdio, 'verbose', print)('%s translate info %s' % (md5, info.md5))
-                return info
+                return self._pattern_check(info, **pattern)
         return None
 
     def get_rpm_pkg_by_info(self, pkg_info):
@@ -464,7 +471,7 @@ def get_best_pkg_info(self, **pattern):
     def get_exact_pkg_info(self, **pattern):
         if 'md5' in pattern and pattern['md5']:
             self.stdio and getattr(self.stdio, 'verbose', print)('md5 is %s' % pattern['md5'])
-            return self.get_rpm_info_by_md5(pattern['md5'])
+            return self.get_rpm_info_by_md5(**pattern)
         self.stdio and getattr(self.stdio, 'verbose', print)('md5 is None')
         if 'name' not in pattern and not pattern['name']:
             self.stdio and getattr(self.stdio, 'verbose', print)('name is None')
@@ -499,7 +506,10 @@ def get_pkgs_info_with_score(self, **pattern):
         matchs = []
         if 'md5' in pattern and pattern['md5']:
             self.stdio and getattr(self.stdio, 'verbose', print)('md5 is %s' % pattern['md5'])
-            return [self.db[pattern['md5']], (0xfffffffff, )] if pattern['md5'] in self.db else matchs
+            info = None
+            if pattern['md5'] in self.db:
+                info = self._pattern_check(self.db[pattern['md5']], **pattern)
+            return [info, (0xfffffffff, )] if info else matchs
         self.stdio and getattr(self.stdio, 'verbose', print)('md5 is None')
         if 'name' not in pattern and not pattern['name']:
             self.stdio and getattr(self.stdio, 'verbose', print)('name is None')
@@ -689,7 +699,10 @@ def get_best_pkg_info(self, **pattern):
     def get_exact_pkg_info(self, **pattern):
         if 'md5' in pattern and pattern['md5']:
             self.stdio and getattr(self.stdio, 'verbose', print)('md5 is %s' % pattern['md5'])
-            return self.db[pattern['md5']] if pattern['md5'] in self.db else None
+            info = None
+            if pattern['md5'] in self.db:
+                info = self._pattern_check(self.db[pattern['md5']], **pattern)
+            return info
         self.stdio and getattr(self.stdio, 'verbose', print)('md5 is None')
         if 'name' not in pattern and not pattern['name']:
             self.stdio and getattr(self.stdio, 'verbose', print)('name is None')
@@ -730,7 +743,10 @@ def get_pkgs_info_with_score(self, **pattern):
         matchs = []
         if 'md5' in pattern and pattern['md5']:
             self.stdio and getattr(self.stdio, 'verbose', print)('md5 is %s' % pattern['md5'])
-            return [self.db[pattern['md5']], (0xfffffffff, )] if pattern['md5'] in self.db else matchs
+            info = None
+            if pattern['md5'] in self.db:
+                info = self._pattern_check(self.db[pattern['md5']], **pattern)
+            return [info, (0xfffffffff, )] if info else matchs
         self.stdio and getattr(self.stdio, 'verbose', print)('md5 is None')
         if 'name' not in pattern and not pattern['name']:
             return matchs