- logger.info("Public Neutron network created successfully.")
- return True
-
-def create_private_neutron_net(neutron):
- try:
- neutron.format = 'json'
- logger.debug('Creating Neutron network %s...' % NEUTRON_PRIVATE_NET_NAME)
- json_body = {'network': {'name': NEUTRON_PRIVATE_NET_NAME,
- 'admin_state_up': True}}
- netw = neutron.create_network(body=json_body)
- net_dict = netw['network']
- network_id = net_dict['id']
- logger.debug("Network '%s' created successfully" % network_id)
-
- logger.debug('Creating Subnet....')
- json_body = {'subnets': [{'cidr': NEUTRON_PRIVATE_SUBNET_CIDR,
- 'ip_version': 4, 'network_id': network_id}]}
- subnet = neutron.create_subnet(body=json_body)
- logger.debug("Subnet '%s' created successfully" % subnet)
-
- logger.debug('Creating Router...')
- json_body = {'router': {'name': ROUTER_NAME, 'admin_state_up': True}}
- router = neutron.create_router(json_body)
- logger.debug("Router '%s' created successfully" % router)
- router_id = router['router']['id']
-
- logger.debug('Creating Port')
- json_body = {'port': {
- 'admin_state_up': True,
- 'device_id': router_id,
- 'name': 'port1',
- 'network_id': network_id,
- }}
- response = neutron.create_port(body=json_body)
- logger.debug("Port created successfully.")
-
- logger.debug('Setting up gateway...')
- public_network_id = get_network_id(neutron,NEUTRON_PUBLIC_NET_NAME)
- json_body = {'network_id': public_network_id, 'enable_snat' : True}
- gateway = neutron.add_gateway_router(router_id,body=json_body)
- logger.debug("Gateway '%s' added successfully" % gateway)
- except:
- print "Error:", sys.exc_info()[0]
+ logger.info('Updating neutron network %s...' % NEUTRON_PRIVATE_NET_NAME)
+ if functest_utils.update_neutron_net(neutron, network_id, shared=True):
+ logger.debug("Network '%s' updated successfully" % network_id)
+ else:
+ logger.info('Updating neutron network %s failed' % network_id)
+
+ logger.debug('Creating Subnet....')
+ subnet_id = functest_utils. \
+ create_neutron_subnet(neutron,
+ NEUTRON_PRIVATE_SUBNET_NAME,
+ NEUTRON_PRIVATE_SUBNET_CIDR,
+ network_id)
+ if not subnet_id: