openstack
/
fuel-web
Code Issues Proposed changes

Change openstack_version to liberty-8.0 in openstack.yaml 

Set release name to 'Liberty' in display name and description of new release.
Set openstack_version setting to 'liberty-8.0' to comply with the existing
versions schema.
Set opesntack_version to 'liberty-8.0' in tests.

Change-Id: I5bdabcf921ccda53b672d3f535238cd4c8c184fc
Closes-bug: 1503663
This commit is contained in:
Oleg Gelbukh 2015-10-22 17:57:23 +00:00
parent 12b15b2351
commit b35cc11a8d
18 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nailgun/nailgun/extensions/cluster_upgrade/tests/base.py
View File

@ -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(

4
nailgun/nailgun/fixtures/openstack.yaml
View File

@ -1920,7 +1920,7 @@
fields:
name: "Liberty on CentOS 6.5"
state: "unavailable"
version: "2015.1.0-8.0"
version: "liberty-8.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."
@ -1993,7 +1993,7 @@
extend: *base_release
fields:
name: "Liberty on Ubuntu 14.04"
version: "2015.1.0-8.0"
version: "liberty-8.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."

8
nailgun/nailgun/fixtures/sample_plugins.json
View File

@ -36,7 +36,7 @@
},
{
"os": "ubuntu",
"version": "2015.1-8.0",
"version": "liberty-8.0",
"mode": ["ha"],
"deployment_scripts_path": "deployment_scripts/",
"repository_path": "repositories/ubuntu"
@ -89,7 +89,7 @@
},
{
"os": "ubuntu",
"version": "2015.1-8.0",
"version": "liberty-8.0",
"mode": ["ha"],
"deployment_scripts_path": "deployment_scripts/",
"repository_path": "repositories/ubuntu"
@ -136,7 +136,7 @@
},
{
"os": "ubuntu",
"version": "2015.1-8.0",
"version": "liberty-8.0",
"mode": ["ha"],
"deployment_scripts_path": "deployment_scripts/",
"repository_path": "repositories/ubuntu"
@ -200,7 +200,7 @@
},
{
"os": "ubuntu",
"version": "2015.1-8.0",
"version": "liberty-8.0",
"mode": ["ha"],
"deployment_scripts_path": "deployment_scripts/",
"repository_path": "repositories/ubuntu"

2
nailgun/nailgun/test/base.py
View File

@ -792,7 +792,7 @@ class EnvironmentManager(object):
'mode': ['ha', 'multinode'],
'deployment_scripts_path': 'deployment_scripts/'},
{'repository_path': 'repositories/ubuntu',
'version': '2015.1-8.0', 'os': 'ubuntu',
'version': 'liberty-8.0', 'os': 'ubuntu',
'mode': ['ha', 'multinode'],
'deployment_scripts_path': 'deployment_scripts/'},
]

6
nailgun/nailgun/test/integration/test_attributes.py
View File

@ -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,
},
])

4
nailgun/nailgun/test/integration/test_cluster_handler.py
View File

@ -308,7 +308,7 @@ class TestClusterComponents(BaseIntegrationTest):
def setUp(self):
super(TestClusterComponents, self).setUp()
self.release = self.env.create_release(
version='2015.1-8.0',
version='liberty-8.0',
operating_system='Ubuntu',
modes=[consts.CLUSTER_MODES.ha_compact],
components_metadata=[
@ -348,7 +348,7 @@ class TestClusterComponents(BaseIntegrationTest):
self.assertEqual(resp.status_code, 400)
self.assertEqual(
u"[u'storage:not_existing_component'] components are not "
"related to release \"release_name_2015.1-8.0\".",
"related to release \"release_name_liberty-8.0\".",
resp.json_body['message']
)

4
nailgun/nailgun/test/integration/test_component_handler.py
View File

@ -24,7 +24,7 @@ class TestComponentHandler(base.BaseIntegrationTest):
def setUp(self):
super(TestComponentHandler, self).setUp()
self.release = self.env.create_release(
version='2015.1-8.0',
version='liberty-8.0',
operating_system='Ubuntu',
modes=[consts.CLUSTER_MODES.ha_compact],
components_metadata=self.env.get_default_components(
@ -34,7 +34,7 @@ class TestComponentHandler(base.BaseIntegrationTest):
fuel_version=['8.0'],
releases=[{
'repository_path': 'repositories/ubuntu',
'version': '2015.1-8.0',
'version': 'liberty-8.0',
'os': 'ubuntu',
'mode': ['ha'],
'deployment_scripts_path': 'deployment_scripts/'}],

2
nailgun/nailgun/test/integration/test_network_configuration.py
View File

@ -534,7 +534,7 @@ class TestNeutronNetworkConfigurationHandler(BaseIntegrationTest):
}]
}
})
self.cluster.release.version = '2015.1-8.0'
self.cluster.release.version = 'liberty-8.0'
self.db.flush()
resp = self.env.neutron_networks_get(self.cluster.id)

2
nailgun/nailgun/test/integration/test_orchestrator_serializer.py
View File

@ -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)

10
nailgun/nailgun/test/integration/test_orchestrator_serializer_80.py
View File

@ -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()

6
nailgun/nailgun/test/integration/test_plugin_manager.py
View File

@ -31,7 +31,7 @@ class TestPluginManager(base.BaseIntegrationTest):
super(TestPluginManager, self).setUp()
self.env.create(
release_kwargs={
'version': '2015.1-8.0',
'version': 'liberty-8.0',
'operating_system': 'Ubuntu'})
self.release = self.env.releases[0]
@ -445,7 +445,7 @@ class TestClusterPluginIntegration(base.BaseTestCase):
'releases': [{
'os': 'ubuntu',
'mode': 'ha',
'version': '2015.1-8.0',
'version': 'liberty-8.0',
}]
}
@ -463,7 +463,7 @@ class TestClusterPluginIntegration(base.BaseTestCase):
self.env.create(
release_kwargs={
'operating_system': consts.RELEASE_OS.ubuntu,
'version': '2015.1-8.0'},
'version': 'liberty-8.0'},
cluster_kwargs={
'mode': consts.CLUSTER_MODES.ha_compact,
})

2
nailgun/nailgun/test/integration/test_provisioning_serializer.py
View File

@ -81,7 +81,7 @@ class TestGetSerializerForCluster(BaseIntegrationTest):
self.assertIs(serializer, ps.ProvisioningSerializer70)
def test_env_8_0(self):
cluster = self._get_cluster('2015.1-8.0')
cluster = self._get_cluster('liberty-8.0')
serializer = ps.get_serializer_for_cluster(cluster)
self.assertIs(serializer, ps.ProvisioningSerializer80)

2
nailgun/nailgun/test/integration/test_task_deploy.py
View File

@ -39,7 +39,7 @@ class TestTaskDeploy(BaseIntegrationTest):
],
release_kwargs={
'operating_system': consts.RELEASE_OS.ubuntu,
'version': '2015.1.0-8.0',
'version': 'liberty-8.0',
},
)
self.cluster = self.env.clusters[-1]

2
nailgun/nailgun/test/integration/test_verify_networks_task_manager.py
View File

@ -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,

2
nailgun/nailgun/test/unit/test_network_check.py
View File

@ -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,

4
nailgun/nailgun/test/unit/test_object_plugin.py
View File

@ -53,7 +53,7 @@ class ExtraFunctions(base.BaseTestCase):
cluster_kwargs={'mode': consts.CLUSTER_MODES.multinode},
release_kwargs={
'name': uuid.uuid4().get_hex(),
'version': '2015.1-8.0',
'version': 'liberty-8.0',
'operating_system': 'Ubuntu',
'modes': [consts.CLUSTER_MODES.multinode,
consts.CLUSTER_MODES.ha_compact]})
@ -91,7 +91,7 @@ class TestPluginCollection(ExtraFunctions):
def test_get_by_release(self):
release = self.env.create_release(
version='2015.1-8.0',
version='liberty-8.0',
operating_system='Ubuntu',
modes=[consts.CLUSTER_MODES.ha_compact])
for plugin in PluginCollection.get_by_release(release):

8
nailgun/nailgun/test/unit/test_objects.py
View File

@ -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]
@ -1345,7 +1345,7 @@ class TestClusterObject(BaseTestCase):
}
release = self.env.create_release(
version='2015.1-8.0',
version='liberty-8.0',
operating_system=consts.RELEASE_OS.ubuntu,
modes=[consts.CLUSTER_MODES.ha_compact],
components_metadata=components)
@ -1649,7 +1649,7 @@ class TestRelease(BaseTestCase):
def test_get_all_components(self):
release = self.env.create_release(
version='2015.1-8.0',
version='liberty-8.0',
operating_system=consts.RELEASE_OS.ubuntu,
modes=[consts.CLUSTER_MODES.ha_compact],
components_metadata=self.env.get_default_components(
@ -1661,7 +1661,7 @@ class TestRelease(BaseTestCase):
fuel_version=['8.0'],
releases=[{
'repository_path': 'repositories/ubuntu',
'version': '2015.1-8.0',
'version': 'liberty-8.0',
'os': 'ubuntu',
'mode': ['ha'],
'deployment_scripts_path': 'deployment_scripts/'}],

4
nailgun/nailgun/test/unit/test_plugin_adapters.py
View File

@ -65,7 +65,7 @@ class TestPluginBase(base.BaseTestCase):
self.env.create(
cluster_kwargs={'mode': consts.CLUSTER_MODES.multinode},
release_kwargs={
'version': '2015.1-8.0',
'version': 'liberty-8.0',
'operating_system': 'Ubuntu',
'modes': [consts.CLUSTER_MODES.multinode,
consts.CLUSTER_MODES.ha_compact]})
@ -81,7 +81,7 @@ class TestPluginBase(base.BaseTestCase):
"""Should return set of all versions this plugin is applicable to"""
self.assertEqual(
self.plugin_adapter.plugin_release_versions,
set(['2014.2-6.0', '2015.1-8.0'])
set(['2014.2-6.0', 'liberty-8.0'])
)
def test_full_name(self):