X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fopenstack_observer%2Fsteps%2Fsync_network_slivers.py;h=3e85e05cf0652b3fc123c1d1dd767b3d2ad7135b;hb=6dedbc186866028249a3185ad0943afca76dc7fc;hp=31e5572bad2358675aad05edf61c8cc6f0d6bb9b;hpb=5f4aff27c6003239fd10594dd097e69431412cc2;p=plstackapi.git diff --git a/planetstack/openstack_observer/steps/sync_network_slivers.py b/planetstack/openstack_observer/steps/sync_network_slivers.py index 31e5572..3e85e05 100644 --- a/planetstack/openstack_observer/steps/sync_network_slivers.py +++ b/planetstack/openstack_observer/steps/sync_network_slivers.py @@ -4,12 +4,19 @@ from django.db.models import F, Q from planetstack.config import Config from observer.openstacksyncstep import OpenStackSyncStep from core.models.network import * +from util.logger import Logger, logging + +logger = Logger(level=logging.INFO) class SyncNetworkSlivers(OpenStackSyncStep): - requested_interval = 3600 + requested_interval = 0 # 3600 provides=[NetworkSliver] - def call(self, failed=[]): + # 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. + + def call(self, **args): networkSlivers = NetworkSliver.objects.all() networkSlivers_by_id = {} networkSlivers_by_port = {} @@ -20,36 +27,62 @@ class SyncNetworkSlivers(OpenStackSyncStep): networks = Network.objects.all() networks_by_id = {} for network in networks: - networks_by_id[network.network_id] = network + for nd in network.networkdeployments_set.all(): + networks_by_id[nd.net_id] = network + + #logger.info("networks_by_id = ") + #for (network_id, network) in networks_by_id.items(): + # logger.info(" %s: %s" % (network_id, network.name)) slivers = Sliver.objects.all() slivers_by_instance_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 deployments + + ports_by_id = {} + for deployment in Deployment.objects.all(): + if not deployment.admin_tenant: + logger.info("deployment %s has no admin_tenant" % deployment.name) + continue + try: + driver = self.driver.admin_driver(deployment=deployment.name,tenant='admin') + ports = driver.shell.quantum.list_ports()["ports"] + except: + logger.log_exc("failed to get ports from deployment %s" % deployment.name) + 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 - print "already accounted for port", port["id"] + #logger.info("already accounted for port %s" % port["id"]) continue if port["device_owner"] != "compute:nova": # we only want the ports that connect to instances + #logger.info("port %s is not a compute port, it is a %s" % (port["id"], port["device_owner"])) + continue + + sliver = slivers_by_instance_id.get(port['device_id'], None) + if not sliver: + logger.info("no sliver for port %s device_id %s" % (port["id"], port['device_id'])) continue network = networks_by_id.get(port['network_id'], None) if not network: - #print "no network for port", port["id"], "network", port["network_id"] - continue + logger.info("no network for port %s network %s" % (port["id"], port["network_id"])) + + # we know it's associated with a sliver, but we don't know + # which network it is part of. - sliver = slivers_by_instance_id.get(port['device_id'], None) - if not sliver: - print "no sliver for port", port["id"], "device_id", port['device_id'] continue - if network.template.sharedNetworkId is not None: + if network.template.sharedNetworkName: # 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. @@ -61,21 +94,58 @@ class SyncNetworkSlivers(OpenStackSyncStep): network = candidate_network if not network: - print "failed to find the correct network for a shared template for port", port["id"], "network", port["network_id"] + logger.info("failed to find the correct network for a shared template for port %s network %s" % (port["id"], port["network_id"])) continue if not port["fixed_ips"]: - print "port", port["id"], "has no fixed_ips" + logger.info("port %s has no fixed_ips" % port["id"]) continue -# print "XXX", port + ip=port["fixed_ips"][0]["ip_address"] + logger.info("creating NetworkSliver (%s, %s, %s, %s)" % (str(network), str(sliver), ip, str(port["id"]))) ns = NetworkSliver(network=network, sliver=sliver, - ip=port["fixed_ips"][0]["ip_address"], + ip=ip, 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(deployment=networkSliver.sliver.node.deployment,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