commit 9e4bfafc262405b51c88aed7423846f489b57424
author Alex <osavatieiev@mirantis.com> Tue Jun 11 15:21:59 2019 -0500
committer Alex <osavatieiev@mirantis.com> Fri Jun 14 12:43:42 2019 -0500
tree 053d2e2a9fc6f12ac20308bb1e47c2a4accde66c
parent 3b8e543bf8516d576b74b5bf96aa075f59bc6667

Fixed net errors, optimizations and sniffer WIP

Quick fix for package versions compare logic:
 - repo update is OK when candidate is the same
 - repo update is not ok when all versions different

Change-Id: I6602d5486b98375b254d0d92a6071fb26582b770
Related-PROD: PROD-28199

cfg_checker/modules/packages/checker.py

diff --git a/cfg_checker/modules/packages/checker.py b/cfg_checker/modules/packages/checker.py
index 972b12f..631c992 100644
--- a/cfg_checker/modules/packages/checker.py
+++ b/cfg_checker/modules/packages/checker.py
@@ -30,7 +30,7 @@
             )
 
         self.force_tag = force_tag
-        self.exclude_repos_keywords = exclude_keywords
+        self.exclude_keywords = exclude_keywords
 
     @staticmethod
     def presort_packages(all_packages, full=None):
@@ -190,7 +190,7 @@
         logger_cli.info("# Openstack version: {}".format(_os))
         logger_cli.info(
             "# Release versions repos keyword exclude list: {}".format(
-                ", ".join(self.exclude_repos_keywords)
+                ", ".join(self.exclude_keywords)
             )
         )
 
@@ -233,15 +233,16 @@
                             _name,
                             tag=self.force_tag,
                             include=[_os, _linux, _arch],
-                            exclude=self.exclude_repos_keywords
+                            exclude=self.exclude_keywords
                         )
                         # if nothing found, look everywhere
+                        # but with no word 'openstack'
                         if not _r:
                             _r = self.rm.get_filtered_versions(
                                 _name,
                                 tag=self.force_tag,
                                 include=[_linux, _arch],
-                                exclude=self.exclude_repos_keywords
+                                exclude=self.exclude_keywords + ['openstack']
                             )
                     # if nothing is found at this point,
                     # repeat search using normal tags
@@ -250,7 +251,7 @@
                             _name,
                             tag=_mcp,
                             include=[_os, _linux, _arch],
-                            exclude=self.exclude_repos_keywords
+                            exclude=self.exclude_keywords
                         )
                     # Once again, if nothing found, look everywhere
                     if not _r:
@@ -258,7 +259,7 @@
                             _name,
                             tag=_mcp,
                             include=[_linux, _arch],
-                            exclude=self.exclude_repos_keywords
+                            exclude=self.exclude_keywords + ['openstack']
                         )
                     # repack versions in flat format
                     _vs = {}

cfg_checker/modules/packages/versions.py

diff --git a/cfg_checker/modules/packages/versions.py b/cfg_checker/modules/packages/versions.py
index c5689d3..e16dab8 100644
--- a/cfg_checker/modules/packages/versions.py
+++ b/cfg_checker/modules/packages/versions.py
@@ -345,8 +345,8 @@
             elif i == c:
                 self.target = c
                 if i < r:
-                    # both are old, new target
-                    self.status = const.VERSION_ERR
+                    # both are intact, new target possible
+                    self.status = const.VERSION_OK
                     self.action = const.ACT_REPO
                     self.target = r
                 elif i > r: