x
/
vmware-nsx
Code Issues Proposed changes

Api replay enhancments 

- Add certificate & noauth for api-replay auth
- Remove the code for not creating SG on the backend
when using api-replay
- Remove some empty fields while creating resources.
- Exit with error code depending on the number of resources not migrated.
- Skip non-active FWaaS objects

Change-Id: If4b479012d4153414af3b6fe95465ad61b41d7fa
This commit is contained in:
asarfaty 2020-12-13 07:26:47 +02:00 committed by Adit Sarfaty
parent 98c13b8956
commit b7834e320c
4 changed files with 97 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
vmware_nsx/api_replay/cli.py
View File

@ -22,6 +22,18 @@ class ApiReplayCli(object):
def __init__(self): def __init__(self):
args = self._setup_argparse() args = self._setup_argparse()
# args validation
if not args.dest_os_endpoint_url:
# auth params are mandatory
if (not args.dest_os_project_name or
not args.dest_os_username or
not args.dest_os_password or
not args.dest_os_username or
not args.dest_os_auth_url):
print("missing destination mandatory auth parameters")
return
client.ApiReplayClient( client.ApiReplayClient(
source_os_tenant_name=args.source_os_project_name, source_os_tenant_name=args.source_os_project_name,
source_os_tenant_domain_id=args.source_os_project_domain_id, source_os_tenant_domain_id=args.source_os_project_domain_id,
@ -35,6 +47,7 @@ class ApiReplayCli(object):
dest_os_user_domain_id=args.dest_os_user_domain_id, dest_os_user_domain_id=args.dest_os_user_domain_id,
dest_os_password=args.dest_os_password, dest_os_password=args.dest_os_password,
dest_os_auth_url=args.dest_os_auth_url, dest_os_auth_url=args.dest_os_auth_url,
dest_os_endpoint_url=args.dest_os_endpoint_url,
dest_plugin=args.dest_plugin, dest_plugin=args.dest_plugin,
use_old_keystone=args.use_old_keystone, use_old_keystone=args.use_old_keystone,
octavia_os_tenant_name=args.octavia_os_project_name, octavia_os_tenant_name=args.octavia_os_project_name,
@ -46,7 +59,8 @@ class ApiReplayCli(object):
neutron_conf=args.neutron_conf, neutron_conf=args.neutron_conf,
ext_net_map=args.external_networks_map, ext_net_map=args.external_networks_map,
logfile=args.logfile, logfile=args.logfile,
max_retry=args.max_retry) max_retry=args.max_retry,
cert_file=args.cert_file)
def _setup_argparse(self): def _setup_argparse(self):
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
@ -86,7 +100,6 @@ class ApiReplayCli(object):
# we will recreate all of these resources over. # we will recreate all of these resources over.
parser.add_argument( parser.add_argument(
"--dest-os-username", "--dest-os-username",
required=True,
help="The dest os-username to use to" help="The dest os-username to use to"
"gather neutron resources with.") "gather neutron resources with.")
parser.add_argument( parser.add_argument(
@ -96,7 +109,6 @@ class ApiReplayCli(object):
"gather neutron resources with.") "gather neutron resources with.")
parser.add_argument( parser.add_argument(
"--dest-os-project-name", "--dest-os-project-name",
required=True,
help="The dest os-project-name to use to " help="The dest os-project-name to use to "
"gather neutron resource with.") "gather neutron resource with.")
parser.add_argument( parser.add_argument(
@ -106,12 +118,14 @@ class ApiReplayCli(object):
"gather neutron resource with.") "gather neutron resource with.")
parser.add_argument( parser.add_argument(
"--dest-os-password", "--dest-os-password",
required=True,
help="The password for this user.") help="The password for this user.")
parser.add_argument( parser.add_argument(
"--dest-os-auth-url", "--dest-os-auth-url",
required=True,
help="The keystone api endpoint for this user.") help="The keystone api endpoint for this user.")
parser.add_argument(
"--dest-os-endpoint-url",
help="The destination neutron api endpoint. If provided noauth "
"calls will be made")
parser.add_argument( parser.add_argument(
"--dest-plugin", "--dest-plugin",
default='nsx-p', default='nsx-p',
@ -122,6 +136,10 @@ class ApiReplayCli(object):
default=False, default=False,
action='store_true', action='store_true',
help="Use old keystone client for source authentication.") help="Use old keystone client for source authentication.")
parser.add_argument(
"--cert-file",
default="",
help="certificate file for the authentication.")
# Arguments required to connect to the octavia client (read only) # Arguments required to connect to the octavia client (read only)
parser.add_argument( parser.add_argument(

85
vmware_nsx/api_replay/client.py
View File

@ -28,6 +28,7 @@ from oslo_serialization import jsonutils
from oslo_utils import excutils from oslo_utils import excutils
from neutron.common import config as neutron_config from neutron.common import config as neutron_config
from neutron_lib import constants as nl_constants
from octavia_lib.api.drivers import driver_lib from octavia_lib.api.drivers import driver_lib
from vmware_nsx.api_replay import utils from vmware_nsx.api_replay import utils
@ -40,6 +41,9 @@ LOG.setLevel(logging.INFO)
# For internal testing only # For internal testing only
use_old_keystone_on_dest = False use_old_keystone_on_dest = False
# Error counter for the migration
n_errors = 0
class ApiReplayClient(utils.PrepareObjectForMigration): class ApiReplayClient(utils.PrepareObjectForMigration):
@ -49,12 +53,13 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
source_os_password, source_os_auth_url, source_os_password, source_os_auth_url,
dest_os_username, dest_os_user_domain_id, dest_os_username, dest_os_user_domain_id,
dest_os_tenant_name, dest_os_tenant_domain_id, dest_os_tenant_name, dest_os_tenant_domain_id,
dest_os_password, dest_os_auth_url, dest_plugin, dest_os_password, dest_os_auth_url, dest_os_endpoint_url,
use_old_keystone, dest_plugin, use_old_keystone,
octavia_os_username, octavia_os_user_domain_id, octavia_os_username, octavia_os_user_domain_id,
octavia_os_tenant_name, octavia_os_tenant_domain_id, octavia_os_tenant_name, octavia_os_tenant_domain_id,
octavia_os_password, octavia_os_auth_url, octavia_os_password, octavia_os_auth_url,
neutron_conf, ext_net_map, logfile, max_retry): neutron_conf, ext_net_map, logfile, max_retry,
cert_file):
# Init config and logging # Init config and logging
if neutron_conf: if neutron_conf:
@ -71,7 +76,6 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
# connect to both clients # connect to both clients
if use_old_keystone: if use_old_keystone:
LOG.info("Using old keystone for source neutron")
# Since we are not sure what keystone version will be used on the # Since we are not sure what keystone version will be used on the
# source setup, we add an option to use the v2 client # source setup, we add an option to use the v2 client
self.source_neutron = client.Client( self.source_neutron = client.Client(
@ -86,15 +90,18 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
tenant_name=source_os_tenant_name, tenant_name=source_os_tenant_name,
tenant_domain_id=source_os_tenant_domain_id, tenant_domain_id=source_os_tenant_domain_id,
password=source_os_password, password=source_os_password,
auth_url=source_os_auth_url) auth_url=source_os_auth_url,
cert_file=cert_file)
if use_old_keystone_on_dest: if use_old_keystone_on_dest:
LOG.info("Using old keystone for destination neutron")
self.dest_neutron = client.Client( self.dest_neutron = client.Client(
username=dest_os_username, username=dest_os_username,
tenant_name=dest_os_tenant_name, tenant_name=dest_os_tenant_name,
password=dest_os_password, password=dest_os_password,
auth_url=dest_os_auth_url) auth_url=dest_os_auth_url)
elif dest_os_endpoint_url:
self.dest_neutron = self.connect_to_local_client(
endpoint_url=dest_os_endpoint_url)
else: else:
self.dest_neutron = self.connect_to_client( self.dest_neutron = self.connect_to_client(
username=dest_os_username, username=dest_os_username,
@ -102,7 +109,8 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
tenant_name=dest_os_tenant_name, tenant_name=dest_os_tenant_name,
tenant_domain_id=dest_os_tenant_domain_id, tenant_domain_id=dest_os_tenant_domain_id,
password=dest_os_password, password=dest_os_password,
auth_url=dest_os_auth_url) auth_url=dest_os_auth_url,
cert_file=cert_file)
if octavia_os_auth_url: if octavia_os_auth_url:
self.octavia = self.connect_to_octavia( self.octavia = self.connect_to_octavia(
@ -111,7 +119,8 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
tenant_name=octavia_os_tenant_name, tenant_name=octavia_os_tenant_name,
tenant_domain_id=octavia_os_tenant_domain_id, tenant_domain_id=octavia_os_tenant_domain_id,
password=octavia_os_password, password=octavia_os_password,
auth_url=octavia_os_auth_url) auth_url=octavia_os_auth_url,
cert_file=cert_file)
else: else:
self.octavia = None self.octavia = None
@ -135,34 +144,43 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
self.migrate_fwaas() self.migrate_fwaas()
if self.octavia: if self.octavia:
self.migrate_octavia() self.migrate_octavia()
LOG.info("NSX migration is Done.") global n_errors
LOG.info("NSX migration is Done with %s errors.", n_errors)
exit(n_errors)
def _get_session(self, username, user_domain_id, def _get_session(self, username, user_domain_id,
tenant_name, tenant_domain_id, tenant_name, tenant_domain_id,
password, auth_url): password, auth_url, cert_file):
auth = identity.Password(username=username, auth = identity.Password(username=username,
user_domain_id=user_domain_id, user_domain_id=user_domain_id,
password=password, password=password,
project_name=tenant_name, project_name=tenant_name,
project_domain_id=tenant_domain_id, project_domain_id=tenant_domain_id,
auth_url=auth_url) auth_url=auth_url)
return session.Session(auth=auth) return session.Session(auth=auth, verify=cert_file)
def connect_to_client(self, username, user_domain_id, def connect_to_client(self, username, user_domain_id,
tenant_name, tenant_domain_id, tenant_name, tenant_domain_id,
password, auth_url): password, auth_url, cert_file):
sess = self._get_session(username, user_domain_id, sess = self._get_session(username, user_domain_id,
tenant_name, tenant_domain_id, tenant_name, tenant_domain_id,
password, auth_url) password, auth_url, cert_file)
neutron = client.Client(session=sess) neutron = client.Client(session=sess)
return neutron return neutron
def connect_to_local_client(self, endpoint_url):
neutron = client.Client(endpoint_url=endpoint_url,
insecure=True,
auth_strategy='noauth')
# test the connection:
return neutron
def connect_to_octavia(self, username, user_domain_id, def connect_to_octavia(self, username, user_domain_id,
tenant_name, tenant_domain_id, tenant_name, tenant_domain_id,
password, auth_url): password, auth_url, cert_file):
sess = self._get_session(username, user_domain_id, sess = self._get_session(username, user_domain_id,
tenant_name, tenant_domain_id, tenant_name, tenant_domain_id,
password, auth_url) password, auth_url, cert_file)
endpoint = sess.get_endpoint(service_type='load-balancer') endpoint = sess.get_endpoint(service_type='load-balancer')
client = octavia.OctaviaAPI( client = octavia.OctaviaAPI(
session=sess, session=sess,
@ -198,6 +216,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
If there is already a rule of that type, skip it since If there is already a rule of that type, skip it since
the QoS policy can have only one rule of each type the QoS policy can have only one rule of each type
""" """
global n_errors
#TODO(asarfaty) also take rule direction into account once #TODO(asarfaty) also take rule direction into account once
#ingress support is upstream #ingress support is upstream
rule_type = source_rule.get('type') rule_type = source_rule.get('type')
@ -223,9 +242,11 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except Exception as e: except Exception as e:
LOG.error("Failed to create QoS rule for policy %(pol)s: %(e)s", LOG.error("Failed to create QoS rule for policy %(pol)s: %(e)s",
{'pol': pol_id, 'e': e}) {'pol': pol_id, 'e': e})
n_errors = n_errors + 1
def migrate_qos_policies(self): def migrate_qos_policies(self):
"""Migrates QoS policies from source to dest neutron.""" """Migrates QoS policies from source to dest neutron."""
global n_errors
# first fetch the QoS policies from both the # first fetch the QoS policies from both the
# source and destination neutron server # source and destination neutron server
@ -263,6 +284,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except Exception as e: except Exception as e:
LOG.error("Failed to create QoS policy %(pol)s: %(e)s", LOG.error("Failed to create QoS policy %(pol)s: %(e)s",
{'pol': pol['id'], 'e': e}) {'pol': pol['id'], 'e': e})
n_errors = n_errors + 1
continue continue
else: else:
LOG.info("Created QoS policy %s", new_pol) LOG.info("Created QoS policy %s", new_pol)
@ -271,6 +293,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
def migrate_security_groups(self): def migrate_security_groups(self):
"""Migrates security groups from source to dest neutron.""" """Migrates security groups from source to dest neutron."""
global n_errors
# first fetch the security groups from both the # first fetch the security groups from both the
# source and dest neutron server # source and dest neutron server
@ -319,6 +342,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create security group (%(sg)s): " LOG.error("Failed to create security group (%(sg)s): "
"%(e)s", "%(e)s",
{'sg': sg, 'e': e}) {'sg': sg, 'e': e})
n_errors = n_errors + 1
# Note - policy security groups will have no rules, and will # Note - policy security groups will have no rules, and will
# be created on the destination with the default rules only # be created on the destination with the default rules only
@ -349,6 +373,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
ports are set. ports are set.
And return a dictionary of external gateway info per router And return a dictionary of external gateway info per router
""" """
global n_errors
try: try:
source_routers = self.source_neutron.list_routers()['routers'] source_routers = self.source_neutron.list_routers()['routers']
except Exception: except Exception:
@ -387,10 +412,12 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except Exception as e: except Exception as e:
LOG.error("Failed to create router %(rtr)s: %(e)s", LOG.error("Failed to create router %(rtr)s: %(e)s",
{'rtr': router, 'e': e}) {'rtr': router, 'e': e})
n_errors = n_errors + 1
return update_routes, gw_info return update_routes, gw_info
def migrate_routers_routes(self, routers_routes): def migrate_routers_routes(self, routers_routes):
"""Add static routes to the created routers.""" """Add static routes to the created routers."""
global n_errors
total_num = len(routers_routes) total_num = len(routers_routes)
LOG.info("Migrating %s routers routes", total_num) LOG.info("Migrating %s routers routes", total_num)
for count, (router_id, routes) in enumerate( for count, (router_id, routes) in enumerate(
@ -405,8 +432,10 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to add routes %(routes)s to router " LOG.error("Failed to add routes %(routes)s to router "
"%(rtr)s: %(e)s", "%(rtr)s: %(e)s",
{'routes': routes, 'rtr': router_id, 'e': e}) {'routes': routes, 'rtr': router_id, 'e': e})
n_errors = n_errors + 1
def migrate_subnetpools(self): def migrate_subnetpools(self):
global n_errors
subnetpools_map = {} subnetpools_map = {}
try: try:
source_subnetpools = self.source_neutron.list_subnetpools()[ source_subnetpools = self.source_neutron.list_subnetpools()[
@ -442,10 +471,12 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except Exception as e: except Exception as e:
LOG.error("Failed to create subnetpool %(pool)s: %(e)s", LOG.error("Failed to create subnetpool %(pool)s: %(e)s",
{'pool': pool, 'e': e}) {'pool': pool, 'e': e})
n_errors = n_errors + 1
return subnetpools_map return subnetpools_map
def migrate_networks_subnets_ports(self, routers_gw_info): def migrate_networks_subnets_ports(self, routers_gw_info):
"""Migrates networks/ports/router-uplinks from src to dest neutron.""" """Migrates networks/ports/router-uplinks from src to dest neutron."""
global n_errors
source_ports = self.source_neutron.list_ports()['ports'] source_ports = self.source_neutron.list_ports()['ports']
source_subnets = self.source_neutron.list_subnets()['subnets'] source_subnets = self.source_neutron.list_subnets()['subnets']
source_networks = self.source_neutron.list_networks()['networks'] source_networks = self.source_neutron.list_networks()['networks']
@ -500,7 +531,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
# Print the network and exception to help debugging # Print the network and exception to help debugging
with excutils.save_and_reraise_exception(): with excutils.save_and_reraise_exception():
LOG.error("Failed to create network %s", body) LOG.error("Failed to create network %s", body)
LOG.error("Source network: %s", network) n_errors = n_errors + 1
raise e raise e
subnets_map = {} subnets_map = {}
@ -556,6 +587,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except n_exc.BadRequest as e: except n_exc.BadRequest as e:
LOG.error("Failed to create subnet: %(subnet)s: %(e)s", LOG.error("Failed to create subnet: %(subnet)s: %(e)s",
{'subnet': subnet, 'e': e}) {'subnet': subnet, 'e': e})
n_errors = n_errors + 1
# create the ports on the network # create the ports on the network
ports = self.get_ports_on_network(network['id'], source_ports) ports = self.get_ports_on_network(network['id'], source_ports)
@ -607,6 +639,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to add router gateway with port " LOG.error("Failed to add router gateway with port "
"(%(port)s): %(e)s", "(%(port)s): %(e)s",
{'port': port, 'e': e}) {'port': port, 'e': e})
n_errors = n_errors + 1
continue continue
# Let the neutron dhcp-agent recreate this on its own # Let the neutron dhcp-agent recreate this on its own
@ -649,6 +682,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to add router interface port" LOG.error("Failed to add router interface port"
"(%(port)s): %(e)s", "(%(port)s): %(e)s",
{'port': port, 'e': e}) {'port': port, 'e': e})
n_errors = n_errors + 1
continue continue
try: try:
@ -659,6 +693,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
# script multiple times as we don't track this. # script multiple times as we don't track this.
LOG.error("Failed to create port (%(port)s) : %(e)s", LOG.error("Failed to create port (%(port)s) : %(e)s",
{'port': port, 'e': e}) {'port': port, 'e': e})
n_errors = n_errors + 1
else: else:
ip_addr = None ip_addr = None
if created_port.get('fixed_ips'): if created_port.get('fixed_ips'):
@ -680,9 +715,11 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to enable DHCP on subnet %(subnet)s: " LOG.error("Failed to enable DHCP on subnet %(subnet)s: "
"%(e)s", "%(e)s",
{'subnet': subnet['id'], 'e': e}) {'subnet': subnet['id'], 'e': e})
n_errors = n_errors + 1
def migrate_floatingips(self): def migrate_floatingips(self):
"""Migrates floatingips from source to dest neutron.""" """Migrates floatingips from source to dest neutron."""
global n_errors
try: try:
source_fips = self.source_neutron.list_floatingips()['floatingips'] source_fips = self.source_neutron.list_floatingips()['floatingips']
except Exception: except Exception:
@ -699,9 +736,11 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
except Exception as e: except Exception as e:
LOG.error("Failed to create floating ip (%(fip)s) : %(e)s", LOG.error("Failed to create floating ip (%(fip)s) : %(e)s",
{'fip': source_fip, 'e': e}) {'fip': source_fip, 'e': e})
n_errors = n_errors + 1
def _migrate_fwaas_resource(self, resource_type, source_objects, def _migrate_fwaas_resource(self, resource_type, source_objects,
dest_objects, prepare_method, create_method): dest_objects, prepare_method, create_method):
global n_errors
total_num = len(source_objects) total_num = len(source_objects)
for count, source_obj in enumerate(source_objects, 1): for count, source_obj in enumerate(source_objects, 1):
# Check if the object already exists # Check if the object already exists
@ -709,6 +748,13 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.info("Skipping %s %s as it already exists on the " LOG.info("Skipping %s %s as it already exists on the "
"destination server", resource_type, source_obj['id']) "destination server", resource_type, source_obj['id'])
continue continue
if (source_obj.get('status') and
source_obj['status'] not in [nl_constants.ACTIVE,
nl_constants.INACTIVE]):
LOG.info("Skipping %s %s %s",
source_obj['status'], resource_type, source_obj['id'])
continue
body = prepare_method(source_obj) body = prepare_method(source_obj)
try: try:
new_obj = create_method({resource_type: body}) new_obj = create_method({resource_type: body})
@ -719,6 +765,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create %(resource)s (%(obj)s) : %(e)s", LOG.error("Failed to create %(resource)s (%(obj)s) : %(e)s",
{'resource': resource_type, 'obj': source_obj, {'resource': resource_type, 'obj': source_obj,
'e': e}) 'e': e})
n_errors = n_errors + 1
def migrate_fwaas(self): def migrate_fwaas(self):
"""Migrates FWaaS V2 objects from source to dest neutron.""" """Migrates FWaaS V2 objects from source to dest neutron."""
@ -772,6 +819,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
def _migrate_octavia_lb(self, lb, orig_map): def _migrate_octavia_lb(self, lb, orig_map):
# Creating all loadbalancers resources on the new nsx driver # Creating all loadbalancers resources on the new nsx driver
# using RPC calls to the plugin listener. # using RPC calls to the plugin listener.
global n_errors
# Create the loadbalancer: # Create the loadbalancer:
lb_body = self.prepare_lb_loadbalancer(lb) lb_body = self.prepare_lb_loadbalancer(lb)
@ -798,6 +846,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create loadbalancer %(lb)s listener " LOG.error("Failed to create loadbalancer %(lb)s listener "
"(%(list)s)", {'list': listener, 'lb': lb_id}) "(%(list)s)", {'list': listener, 'lb': lb_id})
self._delete_octavia_lb(lb_body_for_deletion) self._delete_octavia_lb(lb_body_for_deletion)
n_errors = n_errors + 1
return return
listeners_map[listener_id] = body listeners_map[listener_id] = body
lb_body_for_deletion['listeners'].append(body) lb_body_for_deletion['listeners'].append(body)
@ -816,6 +865,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create loadbalancer %(lb)s pool " LOG.error("Failed to create loadbalancer %(lb)s pool "
"(%(pool)s)", {'pool': pool, 'lb': lb_id}) "(%(pool)s)", {'pool': pool, 'lb': lb_id})
self._delete_octavia_lb(lb_body_for_deletion) self._delete_octavia_lb(lb_body_for_deletion)
n_errors = n_errors + 1
return return
lb_body_for_deletion['pools'].append(pool) lb_body_for_deletion['pools'].append(pool)
@ -834,6 +884,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
"(%(member)s)", "(%(member)s)",
{'member': member, 'pool': pool_id}) {'member': member, 'pool': pool_id})
self._delete_octavia_lb(lb_body_for_deletion) self._delete_octavia_lb(lb_body_for_deletion)
n_errors = n_errors + 1
return return
# Add pool health monitor # Add pool health monitor
@ -849,6 +900,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create pool %(pool)s healthmonitor " LOG.error("Failed to create pool %(pool)s healthmonitor "
"(%(hm)s)", {'hm': hm, 'pool': pool_id}) "(%(hm)s)", {'hm': hm, 'pool': pool_id})
self._delete_octavia_lb(lb_body_for_deletion) self._delete_octavia_lb(lb_body_for_deletion)
n_errors = n_errors + 1
return return
lb_body_for_deletion['pools'][-1]['healthmonitor'] = body lb_body_for_deletion['pools'][-1]['healthmonitor'] = body
@ -873,6 +925,7 @@ class ApiReplayClient(utils.PrepareObjectForMigration):
LOG.error("Failed to create l7policy (%(l7pol)s)", LOG.error("Failed to create l7policy (%(l7pol)s)",
{'l7pol': l7pol}) {'l7pol': l7pol})
self._delete_octavia_lb(lb_body_for_deletion) self._delete_octavia_lb(lb_body_for_deletion)
n_errors = n_errors + 1
return return
LOG.info("Created loadbalancer %s", lb_id) LOG.info("Created loadbalancer %s", lb_id)

6
vmware_nsx/api_replay/utils.py
View File

@ -83,7 +83,8 @@ class PrepareObjectForMigration(object):
'binding:vif_type', 'binding:vif_type',
'binding:host_id', 'binding:host_id',
'vnic_index', 'vnic_index',
'dns_assignment'] 'dns_assignment',
'resource_request']
drop_network_fields = basic_ignore_fields + [ drop_network_fields = basic_ignore_fields + [
'status', 'status',
@ -174,7 +175,8 @@ class PrepareObjectForMigration(object):
# neutron doesn't like some fields being None even though its # neutron doesn't like some fields being None even though its
# what it returns to us. # what it returns to us.
for field in ['provider:physical_network', for field in ['provider:physical_network',
'provider:segmentation_id']: 'provider:segmentation_id',
'vlan_transparent']:
if field in body and body[field] is None: if field in body and body[field] is None:
del body[field] del body[field]

10
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -1330,7 +1330,7 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
if_subnet = interface_ports[0]['fixed_ips'][0]['subnet_id'] if_subnet = interface_ports[0]['fixed_ips'][0]['subnet_id']
if subnet_data.get('id') != if_subnet: if subnet_data.get('id') != if_subnet:
msg = (_("Can not create a DHCP subnet on network %(net)s " msg = (_("Can not create a DHCP subnet on network %(net)s "
"as another %(ver)s subnet is attached to a " "as another IPv%(ver)s subnet is attached to a "
"router") % {'net': net_id, 'ver': ip_ver}) "router") % {'net': net_id, 'ver': ip_ver})
LOG.error(msg) LOG.error(msg)
raise n_exc.InvalidInput(error_message=msg) raise n_exc.InvalidInput(error_message=msg)
@ -3861,10 +3861,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
if cfg.CONF.api_replay_mode: if cfg.CONF.api_replay_mode:
self._handle_api_replay_default_sg(context, secgroup_db) self._handle_api_replay_default_sg(context, secgroup_db)
if cfg.CONF.api_replay_mode:
# Do not create backend resources for SG with api_replay
return secgroup_db
try: try:
# create all the rule entries # create all the rule entries
sg_rules = secgroup_db['security_group_rules'] sg_rules = secgroup_db['security_group_rules']
@ -3986,10 +3982,6 @@ class NsxPolicyPlugin(nsx_plugin_common.NsxPluginV3Base):
self._process_security_group_rule_properties( self._process_security_group_rule_properties(
context, rules_db[i], r['security_group_rule']) context, rules_db[i], r['security_group_rule'])
if cfg.CONF.api_replay_mode:
# Do not create backend resources for SG with api_replay
return rules_db
is_provider_sg = sg.get(provider_sg.PROVIDER) is_provider_sg = sg.get(provider_sg.PROVIDER)
secgroup_logging = self._is_security_group_logged(context, sg_id) secgroup_logging = self._is_security_group_logged(context, sg_id)
category = (NSX_P_PROVIDER_SECTION_CATEGORY if is_provider_sg category = (NSX_P_PROVIDER_SECTION_CATEGORY if is_provider_sg