From 1d5ec8da9aa352d8e35559c63730ace1ef1ccff3 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Tue, 19 Aug 2014 03:00:20 -0400 Subject: [PATCH] Deleting sync_sliver_ips, now obsoleted by sync_network_slivers --- .../steps/sync_sliver_ips.py | 50 ------------------- 1 file changed, 50 deletions(-) delete mode 100644 planetstack/openstack_observer/steps/sync_sliver_ips.py diff --git a/planetstack/openstack_observer/steps/sync_sliver_ips.py b/planetstack/openstack_observer/steps/sync_sliver_ips.py deleted file mode 100644 index d723da5..0000000 --- a/planetstack/openstack_observer/steps/sync_sliver_ips.py +++ /dev/null @@ -1,50 +0,0 @@ -import os -import base64 -from django.db.models import F, Q -from planetstack.config import Config -from observer.openstacksyncstep import OpenStackSyncStep -from core.models.sliver import Sliver -from util.logger import Logger, logging - -logger = Logger(level=logging.INFO) - -class SyncSliverIps(OpenStackSyncStep): - provides=[Sliver] - requested_interval=0 - - def fetch_pending(self, deleted): - return [] # XXX smbaker - disabling this sync_step, since sliver.ip is obsoleted by sync_network_slivers() - - # Not supported yet - if (deleted): - return [] - slivers = Sliver.objects.filter(ip=None) - return slivers - - def sync_record(self, sliver): - driver = self.driver.client_driver(tenant=sliver.slice.name, - deployment=sliver.node.deployment.name) - servers = driver.shell.nova.servers.findall(id=sliver.instance_id) - if not servers: - return - server = servers[0] - - # First try to grab the dedicated public address - # NOTE: "ext-net" is hardcoded here. - ip = None - ext_net_addrs = server.addresses.get("ext-net") - if ext_net_addrs: - ip = ext_net_addrs[0]["addr"] - - # If there was no public address, then grab the first address in the - # list. - if not ip: - if server.addresses: - addrs = server.addresses.values()[0] - if addrs: - ip = addrs[0]["addr"] - - if ip and ip!=sliver.ip: - sliver.ip = ip - sliver.save() - logger.info("saved sliver ip: %s %s" % (sliver, ip)) -- 2.43.0