Merge "Revert "Add output of full subnet from slave node""
This commit is contained in:
commit
84bbbe5f5f
@ -296,13 +296,6 @@ class OpenStackActions(common.Common):
|
|||||||
return net
|
return net
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def get_subnet(self, subnet_name):
|
|
||||||
subnet_list = self.neutron.list_subnets()
|
|
||||||
for subnet in subnet_list['subnets']:
|
|
||||||
if subnet['name'] == subnet_name:
|
|
||||||
return subnet
|
|
||||||
return None
|
|
||||||
|
|
||||||
def get_router(self, network):
|
def get_router(self, network):
|
||||||
router_list = self.neutron.list_routers()
|
router_list = self.neutron.list_routers()
|
||||||
for router in router_list['routers']:
|
for router in router_list['routers']:
|
||||||
|
@ -26,7 +26,6 @@ from proboscis.asserts import assert_equal
|
|||||||
from proboscis.asserts import assert_true
|
from proboscis.asserts import assert_true
|
||||||
|
|
||||||
from fuelweb_test.helpers import checkers
|
from fuelweb_test.helpers import checkers
|
||||||
from fuelweb_test.helpers import os_actions
|
|
||||||
from fuelweb_test import logwrap
|
from fuelweb_test import logwrap
|
||||||
from fuelweb_test import logger
|
from fuelweb_test import logger
|
||||||
from fuelweb_test.helpers.decorators import custom_repo
|
from fuelweb_test.helpers.decorators import custom_repo
|
||||||
@ -1444,17 +1443,15 @@ class FuelWebClient(object):
|
|||||||
'Cidr after deployment is not equal'
|
'Cidr after deployment is not equal'
|
||||||
' to cidr by default')
|
' to cidr by default')
|
||||||
elif net_provider == 'neutron':
|
elif net_provider == 'neutron':
|
||||||
os = os_actions.OpenStackActions(
|
|
||||||
self.get_public_vip(cluster_id))
|
|
||||||
nailgun_cidr = self.get_nailgun_cidr_neutron(cluster_id)
|
nailgun_cidr = self.get_nailgun_cidr_neutron(cluster_id)
|
||||||
logger.debug('nailgun cidr is {0}'.format(nailgun_cidr))
|
logger.debug('nailgun cidr is {0}'.format(nailgun_cidr))
|
||||||
subnet = os.get_subnet('net04__subnet')
|
slave_cidr = ''.join(remote.execute(". openrc; neutron"
|
||||||
logger.debug('net04__subnet: {0}'.format(
|
" subnet-list | awk '$4 =="
|
||||||
subnet))
|
" \"net04__subnet\""
|
||||||
assert_true(subnet, "net04__subnet does not exists")
|
"{print $6}'")['stdout'])
|
||||||
logger.debug('cidr net04__subnet: {0}'.format(
|
logger.debug('slave cidr is {0}'.format(
|
||||||
subnet['cidr']))
|
slave_cidr.rstrip()))
|
||||||
assert_equal(nailgun_cidr, subnet['cidr'].rstrip(),
|
assert_equal(nailgun_cidr, slave_cidr.rstrip(),
|
||||||
'Cidr after deployment is not equal'
|
'Cidr after deployment is not equal'
|
||||||
' to cidr by default')
|
' to cidr by default')
|
||||||
|
|
||||||
|
@ -322,6 +322,7 @@ class NeutronVlanHa(TestBasic):
|
|||||||
_ip = self.fuel_web.get_nailgun_node_by_name('slave-01')['ip']
|
_ip = self.fuel_web.get_nailgun_node_by_name('slave-01')['ip']
|
||||||
self.fuel_web.check_fixed_network_cidr(
|
self.fuel_web.check_fixed_network_cidr(
|
||||||
cluster_id, self.env.d_env.get_ssh_to_remote(_ip))
|
cluster_id, self.env.d_env.get_ssh_to_remote(_ip))
|
||||||
|
|
||||||
self.fuel_web.verify_network(cluster_id)
|
self.fuel_web.verify_network(cluster_id)
|
||||||
devops_node = self.fuel_web.get_nailgun_primary_controller(
|
devops_node = self.fuel_web.get_nailgun_primary_controller(
|
||||||
self.env.d_env.nodes().slaves[0])
|
self.env.d_env.nodes().slaves[0])
|
||||||
|
Loading…
Reference in New Issue
Block a user