summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
81ab8c2)
Change-Id: I54a6ef57909070da1abe915d6a05ce19d6c131fc
Issue-ID: VFC-1163
Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
return Response({'error': req_serializer.errors},
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
ack = InstantNSService(ns_instance_id, request.data).do_biz()
return Response({'error': req_serializer.errors},
status=status.HTTP_500_INTERNAL_SERVER_ERROR)
ack = InstantNSService(ns_instance_id, request.data).do_biz()
- resp_serializer = NsOperateJobSerializer(data=ack['data'])
- if not resp_serializer.is_valid():
- return Response({'error': resp_serializer.errors},
- status=status.HTTP_500_INTERNAL_SERVER_ERROR)
logger.debug("Leave NSInstView::post::ack=%s", ack)
logger.debug("Leave NSInstView::post::ack=%s", ack)
- return Response(data=resp_serializer.data, status=ack['status'])
+ return Response(data=ack['data'], status=ack['status'])
subnet_id = None
if "subnet_name" in data and data["subnet_name"]:
all_subnets = neutron.list_subnets()
subnet_id = None
if "subnet_name" in data and data["subnet_name"]:
all_subnets = neutron.list_subnets()
- filter_subnets = [subnet for subnet in all_subnets["subnets"] if subnet["name"] == data["subnet_name"] and
- subnet["network_id"] == network_id]
+ filter_subnets = [subnet for subnet in all_subnets["subnets"] if subnet["name"] == data["subnet_name"] and subnet["network_id"] == network_id]
count_filter_subnets = len(filter_subnets)
if 1 > count_filter_subnets:
logger.error("Subnet name(%s) does not exist" % data["subnet_name"])
count_filter_subnets = len(filter_subnets)
if 1 > count_filter_subnets:
logger.error("Subnet name(%s) does not exist" % data["subnet_name"])
neutron_admin = neutronbase.get_neutron_default(fun_name(), auth_info)
all_nets = neutron_admin.list_networks()
filter_nets = [net for net in all_nets['networks'] if net['name'] == data["network_name"]]
neutron_admin = neutronbase.get_neutron_default(fun_name(), auth_info)
all_nets = neutron_admin.list_networks()
filter_nets = [net for net in all_nets['networks'] if net['name'] == data["network_name"]]
- sel_nets = [net for net in filter_nets if net['tenant_id'] == tenant_id or
- (net['tenant_id'] != tenant_id and net['shared'])]
+ sel_nets = [net for net in filter_nets if net['tenant_id'] == tenant_id or (net['tenant_id'] != tenant_id and net['shared'])]
count_sel_nets = len(sel_nets)
if 1 > count_sel_nets:
logger.error("Network(%s) does not exist" % data["network_name"])
count_sel_nets = len(sel_nets)
if 1 > count_sel_nets:
logger.error("Network(%s) does not exist" % data["network_name"])
# check port
port_data = None
ports = neutron.list_ports()
# check port
port_data = None
ports = neutron.list_ports()
- sel_ports = [port for port in ports['ports'] if port['tenant_id'] == tenant_id and
- port['network_id'] == network_id]
+ sel_ports = [port for port in ports['ports'] if port['tenant_id'] == tenant_id and port['network_id'] == network_id]
filter_ports = []
for port in sel_ports:
if port['name'] == data["port_name"] and port['fixed_ips']:
filter_ports = []
for port in sel_ports:
if port['name'] == data["port_name"] and port['fixed_ips']:
neutron_admin = neutronbase.get_neutron_default(fun_name(), auth_info)
all_nets = neutron_admin.list_networks()
filter_nets = [net for net in all_nets['networks'] if net['name'] == data["network_name"]]
neutron_admin = neutronbase.get_neutron_default(fun_name(), auth_info)
all_nets = neutron_admin.list_networks()
filter_nets = [net for net in all_nets['networks'] if net['name'] == data["network_name"]]
- sel_nets = [net for net in filter_nets if net['tenant_id'] == tenant_id or
- (net['tenant_id'] != tenant_id and net['shared'])]
+ sel_nets = [net for net in filter_nets if net['tenant_id'] == tenant_id or (net['tenant_id'] != tenant_id and net['shared'])]
count_sel_nets = len(sel_nets)
if 1 < count_sel_nets:
for sel_net in sel_nets:
count_sel_nets = len(sel_nets)
if 1 < count_sel_nets:
for sel_net in sel_nets:
'name': data["subnet_name"],
'cidr': data["cidr"],
'ip_version': int(data["ip_version"]) if "ip_version" in data else const.IPV4, }}
'name': data["subnet_name"],
'cidr': data["cidr"],
'ip_version': int(data["ip_version"]) if "ip_version" in data else const.IPV4, }}
- create_params["subnet"]["enable_dhcp"] = ("enable_dhcp" in data and
- int(data["enable_dhcp"]) == const.ENABLE_DHCP)
+ create_params["subnet"]["enable_dhcp"] = ("enable_dhcp" in data and int(data["enable_dhcp"]) == const.ENABLE_DHCP)
if "gateway_ip" in data and data["gateway_ip"]:
create_params["subnet"]["gateway_ip"] = data["gateway_ip"]
else:
if "gateway_ip" in data and data["gateway_ip"]:
create_params["subnet"]["gateway_ip"] = data["gateway_ip"]
else: