Advertisement
Guest User

Untitled

a guest
Jun 29th, 2016
116
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.98 KB | None | 0 0
  1. diff --git a/nova/network/neutronv2/api.py b/nova/network/neutronv2/api.py
  2. index 9be2c19..16346e2 100644
  3. --- a/nova/network/neutronv2/api.py
  4. +++ b/nova/network/neutronv2/api.py
  5. @@ -619,6 +619,10 @@ class API(base_api.NetworkAPI):
  6.          ports_in_requested_order = []
  7.          nets_in_requested_order = []
  8.          for request in ordered_networks:
  9. +            vifobj = objects.VirtualInterface(context)
  10. +            vifobj.instance_uuid = instance.uuid
  11. +            vifobj.tag = request.tag if 'tag' in request else None
  12. +
  13.              # Network lookup for available network_id
  14.              network = None
  15.              for net in nets:
  16. @@ -655,8 +659,9 @@ class API(base_api.NetworkAPI):
  17.                      bind_host_id=bind_host_id)
  18.                  self._populate_pci_mac_address(instance,
  19.                      request.pci_request_id, port_req_body)
  20. -                self._populate_mac_address(
  21. +                mac_address = self._populate_mac_address(
  22.                      instance, port_req_body, available_macs)
  23. +                vifobj.address = mac_address
  24.                  if dhcp_opts is not None:
  25.                      port_req_body['port']['extra_dhcp_opts'] = dhcp_opts
  26.  
  27. @@ -667,11 +672,15 @@ class API(base_api.NetworkAPI):
  28.                              security_group_ids)
  29.                      created_port_ids.append(created_port_id)
  30.                      ports_in_requested_order.append(created_port_id)
  31. +                    vifobj.uuid = created_port_id
  32.                  else:
  33.                      self._update_port(
  34.                          port_client, instance, request.port_id, port_req_body)
  35.                      preexisting_port_ids.append(request.port_id)
  36.                      ports_in_requested_order.append(request.port_id)
  37. +                    vifobj.uuid = request.port_id
  38. +
  39. +                vifobj.create()
  40.  
  41.                  self._update_port_dns_name(context, instance, network,
  42.                                             ports_in_requested_order[-1],
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement