from django.db.models import F, Q
from planetstack.config import Config
from observer.openstacksyncstep import OpenStackSyncStep
+from core.models import Controller
from core.models.network import *
from util.logger import Logger, logging
requested_interval = 0 # 3600
provides=[NetworkSliver]
- # XXX smbaker: Note that this sync_step only functions for private networks.
# The way it works is to enumerate the all of the ports that quantum
# has, and then work backward from each port's network-id to determine
# which Network is associated from the port.
- #
- # There's a bug somewhere in NetworkDeployment where NAT and Dedicated
- # networks are not getting assigned the correct network IDs. This means
- # we can't reverse map them.
def call(self, **args):
+ logger.info("sync'ing network slivers")
+
networkSlivers = NetworkSliver.objects.all()
networkSlivers_by_id = {}
networkSlivers_by_port = {}
networks = Network.objects.all()
networks_by_id = {}
for network in networks:
- for nd in network.networkdeployments_set.all():
+ for nd in network.controllernetworks.all():
networks_by_id[nd.net_id] = network
#logger.info("networks_by_id = ")
for sliver in slivers:
slivers_by_instance_id[sliver.instance_id] = sliver
- driver = self.driver.client_driver(caller=sliver.creator, tenant=sliver.slice.name, deployment=sliver.node.deployment.name)
- ports = driver.shell.quantum.list_ports()["ports"]
- for port in ports:
+ # Get all ports in all controllers
+
+ ports_by_id = {}
+ for controller in Controller.objects.all():
+ if not controller.admin_tenant:
+ logger.info("controller %s has no admin_tenant" % controller)
+ continue
+ try:
+ driver = self.driver.admin_driver(controller = controller,tenant='admin')
+ ports = driver.shell.quantum.list_ports()["ports"]
+ except:
+ logger.log_exc("failed to get ports from controller %s" % controller)
+ continue
+
+ for port in ports:
+ ports_by_id[port["id"]] = port
+
+ for port in ports_by_id.values():
#logger.info("port %s" % str(port))
if port["id"] in networkSlivers_by_port:
# we already have it
continue
- if network.template.sharedNetworkName:
+ if network.template.shared_network_name:
# If it's a shared network template, then more than one network
# object maps to the quantum network. We have to do a whole bunch
# of extra work to find the right one.
port_id=port["id"])
ns.save()
+ # Now, handle port forwarding
+ # We get the list of NetworkSlivers again, since we might have just
+ # added a few. Then, for each one of them we find it's quantum port and
+ # make sure quantum's nat:forward_ports argument is the same.
+
+ for networkSliver in NetworkSliver.objects.all():
+ try:
+ nat_list = networkSliver.network.nat_list
+ except (TypeError, ValueError), e:
+ logger.info("Failed to decode nat_list: %s" % str(e))
+ continue
+
+ if not networkSliver.port_id:
+ continue
+
+ neutron_port = ports_by_id.get(networkSliver.port_id, None)
+ if not neutron_port:
+ continue
+
+ neutron_nat_list = neutron_port.get("nat:forward_ports", None)
+ if not neutron_nat_list:
+ # make sure that None and the empty set are treated identically
+ neutron_nat_list = []
+
+ if (neutron_nat_list != nat_list):
+ logger.info("Setting nat:forward_ports for port %s network %s sliver %s to %s" % (str(networkSliver.port_id), str(networkSliver.network.id), str(networkSliver.sliver), str(nat_list)))
+ try:
+ driver = self.driver.admin_driver(controller=networkSliver.sliver.node.site_deployment.controller,tenant='admin')
+ driver.shell.quantum.update_port(networkSliver.port_id, {"port": {"nat:forward_ports": nat_list}})
+ except:
+ logger.log_exc("failed to update port with nat_list %s" % str(nat_list))
+ continue
+ else:
+ #logger.info("port %s network %s sliver %s nat %s is already set" % (str(networkSliver.port_id), str(networkSliver.network.id), str(networkSliver.sliver), str(nat_list)))
+ pass
+
def delete_record(self, network_sliver):
# Nothing to do, this is an OpenCloud object
pass