diff --git a/nailgun/nailgun/extensions/cluster_upgrade/tests/base.py b/nailgun/nailgun/extensions/cluster_upgrade/tests/base.py index c99838d5ce..50b07c7766 100644 --- a/nailgun/nailgun/extensions/cluster_upgrade/tests/base.py +++ b/nailgun/nailgun/extensions/cluster_upgrade/tests/base.py @@ -34,7 +34,7 @@ class BaseCloneClusterTest(nailgun_test_base.BaseIntegrationTest): self.release_80 = self.env.create_release( operating_system=consts.RELEASE_OS.ubuntu, - version="2015.1.0-8.0", + version="liberty-8.0", ) self.cluster_61_db = self.env.create_cluster( diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml index e67683c19e..1b26e1d76a 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -1894,7 +1894,7 @@ fields: name: "Liberty on CentOS 6.5" state: "unavailable" - version: "2016.1.0-9.0" + version: "liberty-9.0" can_update_from_versions: [] operating_system: "CentOS" description: "This option will install the OpenStack Liberty packages using a CentOS based operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." @@ -1967,7 +1967,7 @@ extend: *base_release fields: name: "Liberty on Ubuntu 14.04" - version: "2016.1.0-9.0" + version: "liberty-9.0" can_update_from_versions: [] operating_system: "Ubuntu" description: "This option will install the OpenStack Liberty packages using Ubuntu as a base operating system. With high availability features built in, you are getting a robust, enterprise-grade OpenStack deployment." diff --git a/nailgun/nailgun/test/integration/test_attributes.py b/nailgun/nailgun/test/integration/test_attributes.py index 1a3004655f..37d5b656e4 100644 --- a/nailgun/nailgun/test/integration/test_attributes.py +++ b/nailgun/nailgun/test/integration/test_attributes.py @@ -411,7 +411,7 @@ class TestAlwaysEditable(BaseIntegrationTest): super(TestAlwaysEditable, self).setUp() self.env.create( release_kwargs={ - 'version': '2015.1.0-8.0', + 'version': 'liberty-8.0', 'operating_system': consts.RELEASE_OS.centos}) self.cluster = self.env.clusters[0] @@ -457,7 +457,7 @@ class TestAlwaysEditable(BaseIntegrationTest): { 'type': 'rpm', 'name': 'mos', - 'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/x86_64', + 'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/x86_64', 'priority': None, }, { @@ -477,7 +477,7 @@ class TestAlwaysEditable(BaseIntegrationTest): { 'type': 'rpm', 'name': 'Auxiliary', - 'uri': 'http://127.0.0.1:8080/2015.1.0-8.0/centos/auxiliary', + 'uri': 'http://127.0.0.1:8080/liberty-8.0/centos/auxiliary', 'priority': 15, }, ]) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py index ec21d97dc5..8ce987a90c 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_serializer.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer.py @@ -1917,7 +1917,7 @@ class TestNeutronOrchestratorSerializer(OrchestratorSerializerTestBase): 'private' in (fact['network_scheme']['roles']), False) def test_tun_segmentation(self): - self.new_env_release_version = '2015.1.0-8.0' + self.new_env_release_version = 'liberty-8.0' cluster = self.create_env(consts.CLUSTER_MODES.ha_compact, 'tun') facts = self.serializer.serialize(cluster, cluster.nodes) diff --git a/nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py b/nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py index 282ae0f2c4..aa0757ee66 100644 --- a/nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py +++ b/nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py @@ -41,7 +41,7 @@ from nailgun.test.integration.test_orchestrator_serializer_70 import \ class TestSerializer80Mixin(object): - env_version = "2015.1.0-8.0" + env_version = "liberty-8.0" def _check_baremetal_neutron_attrs(self, cluster): self.env._set_additional_component(cluster, 'ironic', True) @@ -70,7 +70,7 @@ class TestNetworkTemplateSerializer80( TestSerializer80Mixin, BaseDeploymentSerializer ): - env_version = '2015.1.0-8.0' + env_version = 'liberty-8.0' def setUp(self, *args): super(TestNetworkTemplateSerializer80, self).setUp() @@ -186,7 +186,7 @@ class TestDeploymentAttributesSerialization80( TestSerializer80Mixin, BaseDeploymentSerializer ): - env_version = '2015.1.0-8.0' + env_version = 'liberty-8.0' def setUp(self): super(TestDeploymentAttributesSerialization80, self).setUp() @@ -380,7 +380,7 @@ class TestDeploymentAttributesSerialization80( class TestMultiNodeGroupsSerialization80(BaseDeploymentSerializer): - env_version = '2015.1.0-8.0' + env_version = 'liberty-8.0' def setUp(self): super(TestMultiNodeGroupsSerialization80, self).setUp() @@ -456,7 +456,7 @@ class TestMultiNodeGroupsSerialization80(BaseDeploymentSerializer): class TestBlockDeviceDevicesSerialization80(BaseDeploymentSerializer): - env_version = '2015.1.0-8.0' + env_version = 'liberty-8.0' def setUp(self): super(TestBlockDeviceDevicesSerialization80, self).setUp() diff --git a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py index 650bd82d17..4c977160a3 100644 --- a/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py +++ b/nailgun/nailgun/test/integration/test_verify_networks_task_manager.py @@ -474,7 +474,7 @@ class TestNetworkVerificationWithTemplates(BaseIntegrationTest): {"name": "eth3", "mac": "00:00:00:00:22:99"}] ) self.cluster = self.env.create( - release_kwargs={'version': '2015.1.0-8.0'}, + release_kwargs={'version': 'liberty-8.0'}, cluster_kwargs={ 'net_provider': consts.CLUSTER_NET_PROVIDERS.neutron, 'net_segment_type': net_type, diff --git a/nailgun/nailgun/test/unit/test_network_check.py b/nailgun/nailgun/test/unit/test_network_check.py index a6794c3350..8780f7a4bf 100644 --- a/nailgun/nailgun/test/unit/test_network_check.py +++ b/nailgun/nailgun/test/unit/test_network_check.py @@ -712,7 +712,7 @@ class TestCheckVIPsNames(BaseIntegrationTest): super(TestCheckVIPsNames, self).setUp() self.env.create( - release_kwargs={'version': '2015.1.0-8.0'}, + release_kwargs={'version': 'liberty-8.0'}, cluster_kwargs={ 'net_provider': consts.CLUSTER_NET_PROVIDERS.neutron, 'net_segment_type': consts.NEUTRON_SEGMENT_TYPES.gre, diff --git a/nailgun/nailgun/test/unit/test_objects.py b/nailgun/nailgun/test/unit/test_objects.py index 0c626e1b95..d48a886334 100644 --- a/nailgun/nailgun/test/unit/test_objects.py +++ b/nailgun/nailgun/test/unit/test_objects.py @@ -207,7 +207,7 @@ class TestNodeObject(BaseIntegrationTest): nodes_kwargs=[{'role': 'controller'}] * 3) new_cluster = self.env.create( cluster_kwargs={'api': False}, - release_kwargs={'version': '2015.1.0-8.0'}, + release_kwargs={'version': 'liberty-8.0'}, ) net_template = self.env.read_fixtures(['network_template_80'])[0]