diff --git a/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py b/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py index a9db3c744b..c5f9f89187 100644 --- a/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py +++ b/nailgun/nailgun/db/migration/alembic_migrations/versions/fuel_9_2.py @@ -140,7 +140,7 @@ CA_FILE = { }] } -SECURITY_GROUP = { +SECURITY_GROUPS = { 'value': 'iptables_hybrid', 'values': [ { @@ -235,7 +235,7 @@ DEFAULT_RELEASE_BOND_ATTRIBUTES = { # version of Fuel when security group switch was added -FUEL_SECURITY_GROUP_VERSION = '9.0' +FUEL_SECURITY_GROUPS_VERSION = '9.0' def update_vmware_attributes_metadata(upgrade): @@ -695,12 +695,12 @@ def upgrade_release_attributes_metadata(connection): 'WHERE id = :release_id') for release_id, attrs, release_version in connection.execute(select_query): - if not migration.is_security_group_available( - release_version, FUEL_SECURITY_GROUP_VERSION): + if not migration.is_security_groups_available( + release_version, FUEL_SECURITY_GROUPS_VERSION): continue attrs = jsonutils.loads(attrs) common = attrs.setdefault('editable', {}).setdefault('common', {}) - common.setdefault('security_group', SECURITY_GROUP) + common.setdefault('security_groups', SECURITY_GROUPS) connection.execute( update_query, release_id=release_id, @@ -720,12 +720,12 @@ def upgrade_cluster_attributes(connection): for cluster_id, editable, release_version in connection.execute( select_query ): - if not migration.is_security_group_available( - release_version, FUEL_SECURITY_GROUP_VERSION): + if not migration.is_security_groups_available( + release_version, FUEL_SECURITY_GROUPS_VERSION): continue editable = jsonutils.loads(editable) - editable.setdefault('common', {}).setdefault('security_group', - SECURITY_GROUP) + editable.setdefault('common', {}).setdefault('security_groups', + SECURITY_GROUPS) connection.execute( update_query, cluster_id=cluster_id, @@ -750,7 +750,7 @@ def downgrade_release_attributes_metadata(connection): for release_id, attrs in connection.execute(select_query): attrs = jsonutils.loads(attrs) attrs.setdefault('editable', {}).setdefault('common', {}).pop( - 'security_group', None) + 'security_groups', None) connection.execute( update_query, release_id=release_id, @@ -768,7 +768,7 @@ def downgrade_cluster_attributes(connection): for cluster_id, editable in connection.execute(select_query): editable = jsonutils.loads(editable) - editable.setdefault('common', {}).pop('security_group', None) + editable.setdefault('common', {}).pop('security_groups', None) connection.execute( update_query, cluster_id=cluster_id, diff --git a/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py b/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py index c7b428b6f3..25192e248f 100644 --- a/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py +++ b/nailgun/nailgun/test/unit/test_downgrade_fuel_9_2.py @@ -35,7 +35,7 @@ ATTRIBUTES_METADATA = { 'common': {} } } -SECURITY_GROUP = { +SECURITY_GROUPS = { 'value': 'iptables_hybrid', 'values': [ { @@ -110,7 +110,7 @@ def prepare(): attrs_with_sec_group = deepcopy(ATTRIBUTES_METADATA) attrs_with_sec_group.setdefault('editable', {}).setdefault( - 'common', {}).setdefault('security_group', SECURITY_GROUP) + 'common', {}).setdefault('security_group', SECURITY_GROUPS) plugin = { 'name': 'Test_P', 'version': '3.0.0', @@ -434,7 +434,7 @@ class TestAttributesDowngrade(base.BaseAlembicMigrationTest): for editable in results: editable = jsonutils.loads(editable[0]) common = editable.setdefault('common', {}) - self.assertEqual(common.get('security_group'), None) + self.assertEqual(common.get('security_groups'), None) def test_release_attributes_downgrade(self): releases = self.meta.tables['releases'] @@ -443,4 +443,4 @@ class TestAttributesDowngrade(base.BaseAlembicMigrationTest): for attrs in results: attrs = jsonutils.loads(attrs[0]) common = attrs.setdefault('editable', {}).setdefault('common', {}) - self.assertEqual(common.get('security_group'), None) + self.assertEqual(common.get('security_groups'), None) diff --git a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py index 328ab7ac9d..f265573e1c 100644 --- a/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py +++ b/nailgun/nailgun/test/unit/test_migration_fuel_9_2.py @@ -57,7 +57,7 @@ ATTRIBUTES_METADATA = { } } -SECURITY_GROUP = { +SECURITY_GROUPS = { 'value': 'iptables_hybrid', 'values': [ { @@ -729,7 +729,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for attrs in results: attrs = jsonutils.loads(attrs[0]) common = attrs.setdefault('editable', {}).setdefault('common', {}) - self.assertEqual(common.get('security_group'), SECURITY_GROUP) + self.assertEqual(common.get('security_groups'), SECURITY_GROUPS) def test_release_attributes_no_update(self): releases = self.meta.tables['releases'] @@ -741,7 +741,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for attrs in results: attrs = jsonutils.loads(attrs[0]) common = attrs.setdefault('editable', {}).setdefault('common', {}) - self.assertEqual(common.get('security_group'), None) + self.assertEqual(common.get('security_groups'), None) def test_cluster_attributes_update(self): clusters_attributes = self.meta.tables['attributes'] @@ -756,7 +756,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for editable in results: editable = jsonutils.loads(editable[0]) common = editable.setdefault('common', {}) - self.assertEqual(common.get('security_group'), SECURITY_GROUP) + self.assertEqual(common.get('security_groups'), SECURITY_GROUPS) def test_cluster_attributes_no_update(self): clusters_attributes = self.meta.tables['attributes'] @@ -771,7 +771,7 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): for editable in results: editable = jsonutils.loads(editable[0]) common = editable.setdefault('common', {}) - self.assertEqual(common.get('security_group'), None) + self.assertEqual(common.get('security_groups'), None) def get_release_ids(self, start_version, available=True): """Get release ids @@ -791,8 +791,8 @@ class TestAttributesUpdate(base.BaseAlembicMigrationTest): release_ids = [] for release_id, release_version in results: if (available == - migration.is_security_group_available(release_version, - start_version)): + migration.is_security_groups_available(release_version, + start_version)): release_ids.append(release_id) return release_ids diff --git a/nailgun/nailgun/utils/migration.py b/nailgun/nailgun/utils/migration.py index 47f7f2a344..9c6233e944 100644 --- a/nailgun/nailgun/utils/migration.py +++ b/nailgun/nailgun/utils/migration.py @@ -570,7 +570,7 @@ def upgrade_cluster_attributes_6_0_to_6_1(connection): attr_id=attr_id) -def is_security_group_available(release_version, compare_version): +def is_security_groups_available(release_version, compare_version): env_version = get_environment_version(release_version) return vers.StrictVersion(env_version) >= vers.StrictVersion( compare_version)