Disable net_check for neutron
Change-Id: If3f7125225640efd3887912974e7ccabc5bdf9fe Closes-bug:#1248544
This commit is contained in:
parent
7235ca0408
commit
55ec7c014b
@ -388,6 +388,18 @@ class VerifyNetworksTaskManager(TaskManager):
|
||||
)
|
||||
db().refresh(task)
|
||||
|
||||
#disable neutron with vlan connectivity check after deployment
|
||||
if task.status != 'error':
|
||||
if (
|
||||
task.cluster.status != 'new' and
|
||||
task.cluster.net_provider == 'neutron'
|
||||
):
|
||||
task.status = 'error'
|
||||
task.message = ('Network verification on Neutron'
|
||||
' is not implemented yet')
|
||||
|
||||
db().commit()
|
||||
|
||||
if task.status != 'error':
|
||||
# this one is connected with UI issues - we need to
|
||||
# separate if error happened inside nailgun or somewhere
|
||||
|
@ -166,3 +166,66 @@ class TestVerifyNetworkTaskManagers(BaseIntegrationTest):
|
||||
expect_errors=True
|
||||
)
|
||||
self.assertEquals(400, resp.status)
|
||||
|
||||
|
||||
class TestVerifyNetworksDisabled(BaseIntegrationTest):
|
||||
|
||||
def setUp(self):
|
||||
super(TestVerifyNetworksDisabled, self).setUp()
|
||||
meta = self.env.default_metadata()
|
||||
self.env.set_interfaces_in_meta(meta, [{
|
||||
"mac": "00:00:00:00:00:66",
|
||||
"max_speed": 1000,
|
||||
"name": "eth0",
|
||||
"current_speed": 1000
|
||||
}, {
|
||||
"mac": "00:00:00:00:00:77",
|
||||
"max_speed": 1000,
|
||||
"name": "eth1",
|
||||
"current_speed": None
|
||||
}, {
|
||||
"mac": "00:00:00:00:00:88",
|
||||
"max_speed": 1000,
|
||||
"name": "eth2",
|
||||
"current_speed": None}])
|
||||
self.env.create(
|
||||
cluster_kwargs={
|
||||
'net_provider': 'neutron',
|
||||
'net_segment_type': 'vlan'
|
||||
},
|
||||
nodes_kwargs=[
|
||||
{
|
||||
'api': True,
|
||||
'roles': ['controller'],
|
||||
'pending_addition': True,
|
||||
'meta': meta,
|
||||
'mac': "00:00:00:00:00:66"
|
||||
},
|
||||
]
|
||||
)
|
||||
self.env.create(
|
||||
cluster_kwargs={'status': 'operational',
|
||||
'net_provider': 'neutron',
|
||||
'net_segment_type': 'vlan'},
|
||||
nodes_kwargs=[
|
||||
{
|
||||
'api': False,
|
||||
},
|
||||
{
|
||||
'api': False,
|
||||
},
|
||||
]
|
||||
)
|
||||
self.cluster = self.env.clusters[0]
|
||||
self.cluster.status = 'operational'
|
||||
self.db.commit()
|
||||
|
||||
@fake_tasks(fake_rpc=False)
|
||||
def test_network_verification_neutron_with_vlan_segmentation(
|
||||
self, mocked_rpc):
|
||||
task = self.env.launch_verify_networks()
|
||||
self.assertEqual(task.status, 'error')
|
||||
self.assertEqual(
|
||||
(u'Network verification on Neutron is not implemented yet'),
|
||||
task.message
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user