openstack/magnum
Code Issues Proposed changes

Merge "Remove duplicated keys in dict"

Browse Source
This commit is contained in:
Zuul 2022-11-09 12:58:31 +00:00 committed by Gerrit Code Review
commit 1bd6bad1d7
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/tests/unit/conductor/handlers/test_k8s_cluster_conductor.py
View File

@ -116,7 +116,6 @@ class TestClusterConductorWithK8s(base.TestCase):
'service_cluster_ip_range': '10.254.0.0/16', 'service_cluster_ip_range': '10.254.0.0/16',
'boot_volume_size': '60'}, 'boot_volume_size': '60'},
'master_flavor_id': 'master_flavor_id', 'master_flavor_id': 'master_flavor_id',
'flavor_id': 'flavor_id',
'project_id': 'project_id', 'project_id': 'project_id',
'keystone_auth_default_policy': self.keystone_auth_default_policy, 'keystone_auth_default_policy': self.keystone_auth_default_policy,
'fixed_network': 'fixed_network', 'fixed_network': 'fixed_network',
@ -370,8 +369,6 @@ class TestClusterConductorWithK8s(base.TestCase):
'portal_network_cidr': '10.254.0.0/16', 'portal_network_cidr': '10.254.0.0/16',
'project_id': 'project_id', 'project_id': 'project_id',
'max_node_count': 2, 'max_node_count': 2,
'master_image': 'image_id',
'minion_image': 'image_id',
'keystone_auth_default_policy': self.keystone_auth_default_policy, 'keystone_auth_default_policy': self.keystone_auth_default_policy,
'boot_volume_size': '60', 'boot_volume_size': '60',
'boot_volume_type': 'lvmdriver-1', 'boot_volume_type': 'lvmdriver-1',
@ -530,8 +527,6 @@ class TestClusterConductorWithK8s(base.TestCase):
'portal_network_cidr': '10.254.0.0/16', 'portal_network_cidr': '10.254.0.0/16',
'project_id': 'project_id', 'project_id': 'project_id',
'max_node_count': 2, 'max_node_count': 2,
'master_image': 'image_id',
'minion_image': 'image_id',
'keystone_auth_default_policy': self.keystone_auth_default_policy, 'keystone_auth_default_policy': self.keystone_auth_default_policy,
'boot_volume_size': '60', 'boot_volume_size': '60',
'boot_volume_type': 'lvmdriver-1', 'boot_volume_type': 'lvmdriver-1',
@ -1163,8 +1158,6 @@ class TestClusterConductorWithK8s(base.TestCase):
'portal_network_cidr': '10.254.0.0/16', 'portal_network_cidr': '10.254.0.0/16',
'project_id': 'project_id', 'project_id': 'project_id',
'max_node_count': 2, 'max_node_count': 2,
'master_image': 'image_id',
'minion_image': 'image_id',
'keystone_auth_default_policy': self.keystone_auth_default_policy, 'keystone_auth_default_policy': self.keystone_auth_default_policy,
'boot_volume_size': '60', 'boot_volume_size': '60',
'boot_volume_type': 'lvmdriver-1', 'boot_volume_type': 'lvmdriver-1',

2
magnum/tests/unit/conductor/test_monitors.py
View File

@ -607,7 +607,7 @@ class MonitorsTestCase(base.TestCase):
m_fields.ClusterHealthStatus.UNHEALTHY) m_fields.ClusterHealthStatus.UNHEALTHY)
self.assertEqual(self.k8s_monitor.data['health_status_reason'], self.assertEqual(self.k8s_monitor.data['health_status_reason'],
{'api': 'ok', 'k8s-cluster-node-0.Ready': False, {'api': 'ok', 'k8s-cluster-node-0.Ready': False,
'api': 'ok', 'k8s-cluster-node-1.Ready': True}) 'k8s-cluster-node-1.Ready': True})
@mock.patch('magnum.conductor.k8s_api.create_client_files') @mock.patch('magnum.conductor.k8s_api.create_client_files')
def test_k8s_monitor_health_unreachable_cluster( def test_k8s_monitor_health_unreachable_cluster(

2
magnum/tests/unit/drivers/test_template_definition.py
View File

@ -737,7 +737,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'kube_version': kube_tag, 'kube_version': kube_tag,
'master_kube_tag': kube_tag, 'master_kube_tag': kube_tag,
'minion_kube_tag': kube_tag, 'minion_kube_tag': kube_tag,
'boot_volume_size': boot_volume_size,
'boot_volume_type': boot_volume_type, 'boot_volume_type': boot_volume_type,
'etcd_volume_type': etcd_volume_type, 'etcd_volume_type': etcd_volume_type,
'ostree_remote': ostree_remote, 'ostree_remote': ostree_remote,
@ -1305,7 +1304,6 @@ class AtomicK8sTemplateDefinitionTestCase(BaseK8sTemplateDefinitionTestCase):
'kube_version': kube_tag, 'kube_version': kube_tag,
'master_kube_tag': kube_tag, 'master_kube_tag': kube_tag,
'minion_kube_tag': kube_tag, 'minion_kube_tag': kube_tag,
'boot_volume_size': boot_volume_size,
'boot_volume_type': boot_volume_type, 'boot_volume_type': boot_volume_type,
'etcd_volume_type': etcd_volume_type, 'etcd_volume_type': etcd_volume_type,
'ostree_remote': ostree_remote, 'ostree_remote': ostree_remote,