From c8a5ae2a219affc2a0cdbb6a9975d5b447b6fee7 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Fri, 3 Apr 2015 19:23:23 +0300 Subject: [PATCH] Add auxiliary repo to ubuntu and centos Depends-On: I87f848bd13f7402bd608e5d50c488392739ca0a3 Change-Id: I3c719fba4170616a4cd9ff5d837e83000737e54e blueprint separate-mos-from-linux --- nailgun/nailgun/fixtures/openstack.yaml | 10 +++++++++ .../test/integration/test_attributes.py | 20 ++++++++++++------ .../unit/test_stages_task_serialization.py | 21 ++++++++++++------- 3 files changed, 37 insertions(+), 14 deletions(-) diff --git a/nailgun/nailgun/fixtures/openstack.yaml b/nailgun/nailgun/fixtures/openstack.yaml index c8a38275eb..1d225394fe 100644 --- a/nailgun/nailgun/fixtures/openstack.yaml +++ b/nailgun/nailgun/fixtures/openstack.yaml @@ -1235,6 +1235,10 @@ name: "mos" uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/x86_64" priority: null + - type: "rpm" + name: "Auxiliary" + uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/centos/auxiliary" + priority: null generated: cobbler: profile: @@ -1314,6 +1318,12 @@ suite: "mos6.1-holdback" section: "main restricted" priority: 1100 + - type: "deb" + name: "Auxiliary" + uri: "http://{settings.MASTER_IP}:8080/{cluster.release.version}/ubuntu/auxiliary" + suite: "auxiliary" + section: "main restricted" + priority: 1050 generated: repo_setup: installer_kernel: diff --git a/nailgun/nailgun/test/integration/test_attributes.py b/nailgun/nailgun/test/integration/test_attributes.py index 27c3476ada..f2bbf7ae29 100644 --- a/nailgun/nailgun/test/integration/test_attributes.py +++ b/nailgun/nailgun/test/integration/test_attributes.py @@ -422,12 +422,20 @@ class TestAlwaysEditable(BaseIntegrationTest): self._put(data, expect_code=403) attrs = self.cluster.attributes.editable - self.assertEqual(attrs['repo_setup']['repos']['value'], [{ - 'type': 'rpm', - 'name': 'mos', - 'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/x86_64', - 'priority': None, - }]) + self.assertItemsEqual(attrs['repo_setup']['repos']['value'], [ + { + 'type': 'rpm', + 'name': 'mos', + 'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/x86_64', + 'priority': None, + }, + { + 'type': 'rpm', + 'name': 'Auxiliary', + 'uri': 'http://127.0.0.1:8080/2014.2-6.1/centos/auxiliary', + 'priority': None, + }, + ]) class TestVmwareAttributes(BaseIntegrationTest): diff --git a/nailgun/nailgun/test/unit/test_stages_task_serialization.py b/nailgun/nailgun/test/unit/test_stages_task_serialization.py index bfb7f18513..145aa2e51c 100644 --- a/nailgun/nailgun/test/unit/test_stages_task_serialization.py +++ b/nailgun/nailgun/test/unit/test_stages_task_serialization.py @@ -80,7 +80,7 @@ class TestHooksSerializersUbuntu(BaseTaskSerializationTestUbuntu): task = tasks_serializer.UploadMOSRepo( task_config, self.cluster, self.nodes) serialized = list(task.serialize()) - self.assertEqual(len(serialized), 14) + self.assertEqual(len(serialized), 16) self.assertEqual(serialized[0]['type'], 'shell') self.assertEqual(serialized[1]['type'], 'upload_file') self.assertEqual(serialized[2]['type'], 'upload_file') @@ -94,8 +94,10 @@ class TestHooksSerializersUbuntu(BaseTaskSerializationTestUbuntu): self.assertEqual(serialized[10]['type'], 'upload_file') self.assertEqual(serialized[11]['type'], 'upload_file') self.assertEqual(serialized[12]['type'], 'upload_file') - self.assertEqual(serialized[13]['type'], 'shell') - self.assertEqual(serialized[13]['parameters']['cmd'], 'apt-get update') + self.assertEqual(serialized[13]['type'], 'upload_file') + self.assertEqual(serialized[14]['type'], 'upload_file') + self.assertEqual(serialized[15]['type'], 'shell') + self.assertEqual(serialized[15]['parameters']['cmd'], 'apt-get update') self.assertItemsEqual(serialized[3]['uids'], self.all_uids) @@ -124,11 +126,12 @@ class TestHooksSerializers(BaseTaskSerializationTest): task = tasks_serializer.UploadMOSRepo( task_config, self.cluster, self.nodes) serialized = list(task.serialize()) - self.assertEqual(len(serialized), 2) + self.assertEqual(len(serialized), 3) self.assertEqual(serialized[0]['type'], 'upload_file') - self.assertEqual(serialized[1]['type'], 'shell') - self.assertEqual(serialized[1]['parameters']['cmd'], 'yum clean all') - self.assertItemsEqual(serialized[1]['uids'], self.all_uids) + self.assertEqual(serialized[1]['type'], 'upload_file') + self.assertEqual(serialized[2]['type'], 'shell') + self.assertEqual(serialized[2]['parameters']['cmd'], 'yum clean all') + self.assertItemsEqual(serialized[2]['uids'], self.all_uids) def test_serialize_rados_with_ceph(self): task_config = {'id': 'restart_radosgw', @@ -292,7 +295,7 @@ class TestPreTaskSerialization(BaseTaskSerializationTestUbuntu): self.graph = deployment_graph.AstuteGraph(self.cluster) self.cluster.release.operating_system = consts.RELEASE_OS.ubuntu tasks = self.graph.pre_tasks_serialize(self.nodes) - self.assertEqual(len(tasks), 17) + self.assertEqual(len(tasks), 19) tasks_tests = [('shell', ['master']), ('shell', sorted(self.all_uids)), ('upload_file', sorted(self.all_uids)), @@ -307,6 +310,8 @@ class TestPreTaskSerialization(BaseTaskSerializationTestUbuntu): ('upload_file', sorted(self.all_uids)), ('upload_file', sorted(self.all_uids)), ('upload_file', sorted(self.all_uids)), + ('upload_file', sorted(self.all_uids)), + ('upload_file', sorted(self.all_uids)), ('copy_files', sorted(self.all_uids)), ('sync', sorted(self.all_uids)), ('shell', sorted(self.all_uids))]