From 59a628df4dcd96a01e7a4276615abcfb90662eed Mon Sep 17 00:00:00 2001 From: Sahil Sabharwal Date: Tue, 8 Nov 2016 16:59:19 -0800 Subject: [PATCH] Default ip_family is set to None instead of ipv4 Change-Id: Id9d1973228d8fd7de9700cd1b9923aa0d8fa6e86 Closes-Bug: 1604923 --- src/config/api-server/vnc_cfg_types.py | 8 ++++++-- .../vnc_openstack/vnc_openstack/neutron_plugin_db.py | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/config/api-server/vnc_cfg_types.py b/src/config/api-server/vnc_cfg_types.py index bed33c06593..795dda6f3fb 100644 --- a/src/config/api-server/vnc_cfg_types.py +++ b/src/config/api-server/vnc_cfg_types.py @@ -416,8 +416,12 @@ def pre_dbe_create(cls, tenant_name, obj_dict, db_conn): subnet_uuid = obj_dict.get('subnet_uuid') req_ip_family = obj_dict.get("instance_ip_family") - req_ip_version = 4 # default ip v4 - if req_ip_family == "v6": req_ip_version = 6 + if req_ip_family == "v4": + req_ip_version = 4 + elif req_ip_family == "v6": + req_ip_version = 6 + else: + req_ip_version = None # if request has ip and not g/w ip, report if already in use. # for g/w ip, creation allowed but only can ref to router port. diff --git a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py index 5a5330b5c29..ce32e12be48 100644 --- a/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py +++ b/src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py @@ -3624,7 +3624,7 @@ def _ip_addr_in_net_id(self, ip_addr, net_id): return ip_addr in net_ip_list def _create_instance_ip(self, net_obj, port_obj, ip_addr=None, - subnet_uuid=None, ip_family="v4"): + subnet_uuid=None, ip_family=None): ip_name = str(uuid.uuid4()) ip_obj = InstanceIp(name=ip_name) ip_obj.uuid = ip_name @@ -3643,7 +3643,7 @@ def _create_instance_ip(self, net_obj, port_obj, ip_addr=None, return ip_id # end _create_instance_ip - def _port_create_instance_ip(self, net_obj, port_obj, port_q, ip_family="v4"): + def _port_create_instance_ip(self, net_obj, port_obj, port_q, ip_family=None): fixed_ips = port_q.get('fixed_ips') if fixed_ips is None: return