CORD-879 Eliminate Proxy models in VSG Service
Change-Id: I481974c391504c0566fe99caea79ef3b7d90b212
diff --git a/xos/synchronizer/steps/sync_vcpetenant.py b/xos/synchronizer/steps/sync_vcpetenant.py
index cb7ec15..e54b7e1 100644
--- a/xos/synchronizer/steps/sync_vcpetenant.py
+++ b/xos/synchronizer/steps/sync_vcpetenant.py
@@ -25,14 +25,10 @@
parentdir = os.path.join(os.path.dirname(__file__),"..")
sys.path.insert(0,parentdir)
-from broadbandshield import BBS
-
logger = Logger(level=logging.INFO)
ENABLE_QUICK_UPDATE=False
-CORD_USE_VTN = getattr(Config(), "networking_use_vtn", False)
-
class SyncVSGTenant(SyncInstanceUsingAnsible):
provides=[VSGTenant]
observes=VSGTenant
@@ -66,7 +62,6 @@
# object itself. In the case of vCPE, we need to know:
# 1) the addresses of dnsdemux, to setup dnsmasq in the vCPE
# 2) CDN prefixes, so we know what URLs to send to dnsdemux
- # 3) BroadBandShield server addresses, for parental filtering
# 4) vlan_ids, for setting up networking in the vCPE VM
vcpe_service = self.get_vcpe_service(o)
@@ -118,25 +113,6 @@
dnsdemux_ip = dnsdemux_ip or "none"
- # Broadbandshield can either be set up internally, using vcpe_service.bbs_slice,
- # or it can be setup externally using vcpe_service.bbs_server.
-
- bbs_addrs = []
- if vcpe_service.bbs_slice:
- if vcpe_service.backend_network_label:
- for bbs_instance in vcpe_service.bbs_slice.instances.all():
- for ns in bbs_instance.ports.all():
- if ns.ip and ns.network.labels and (vcpe_service.backend_network_label in ns.network.labels):
- bbs_addrs.append(ns.ip)
- else:
- logger.info("unsupported configuration -- bbs_slice is set, but backend_network_label is not",extra=o.tologdict())
- if not bbs_addrs:
- logger.info("failed to find any usable addresses on bbs_slice",extra=o.tologdict())
- elif vcpe_service.bbs_server:
- bbs_addrs.append(vcpe_service.bbs_server)
- else:
- logger.info("neither bbs_slice nor bbs_server is configured in the vCPE",extra=o.tologdict())
-
s_tags = []
c_tags = []
if o.volt:
@@ -171,7 +147,6 @@
"docker_opts": " ".join(docker_opts),
"dnsdemux_ip": dnsdemux_ip,
"cdn_prefixes": cdn_prefixes,
- "bbs_addrs": bbs_addrs,
"full_setup": full_setup,
"isolation": o.instance.isolation,
"safe_browsing_macs": safe_macs,
@@ -189,66 +164,8 @@
def sync_fields(self, o, fields):
# the super causes the playbook to be run
-
super(SyncVSGTenant, self).sync_fields(o, fields)
- # now do all of our broadbandshield stuff...
-
- service = self.get_vcpe_service(o)
- if not service:
- # Ansible uses the service's keypair in order to SSH into the
- # instance. It would be bad if the slice had no service.
-
- raise Exception("Slice %s is not associated with a service" % instance.slice.name)
-
- # Make sure the slice is configured properly
- if (service != o.instance.slice.service):
- raise Exception("Slice %s is associated with some service that is not %s" % (str(instance.slice), str(service)))
-
- # only enable filtering if we have a subscriber object (see below)
- url_filter_enable = False
-
- # for attributes that come from CordSubscriberRoot
- if o.volt and o.volt.subscriber:
- url_filter_enable = o.volt.subscriber.url_filter_enable
- url_filter_level = o.volt.subscriber.url_filter_level
- url_filter_users = o.volt.subscriber.devices
-
- if service.url_filter_kind == "broadbandshield":
- # disable url_filter if there are no bbs_addrs
- if url_filter_enable and (not fields.get("bbs_addrs",[])):
- logger.info("disabling url_filter because there are no bbs_addrs",extra=o.tologdict())
- url_filter_enable = False
-
- if url_filter_enable:
- bbs_hostname = None
- if service.bbs_api_hostname and service.bbs_api_port:
- bbs_hostname = service.bbs_api_hostname
- else:
- # TODO: extract from slice
- bbs_hostname = "cordcompute01.onlab.us"
-
- if service.bbs_api_port:
- bbs_port = service.bbs_api_port
- else:
- bbs_port = 8018
-
- if not bbs_hostname:
- logger.info("broadbandshield is not configured",extra=o.tologdict())
- else:
- tStart = time.time()
- bbs = BBS(o.bbs_account, "123", bbs_hostname, bbs_port)
- bbs.sync(url_filter_level, url_filter_users)
-
- if o.hpc_client_ip:
- logger.info("associate account %s with ip %s" % (o.bbs_account, o.hpc_client_ip),extra=o.tologdict())
- bbs.associate(o.hpc_client_ip)
- else:
- logger.info("no hpc_client_ip to associate",extra=o.tologdict())
-
- logger.info("bbs update time %d" % int(time.time()-tStart),extra=o.tologdict())
-
-
def run_playbook(self, o, fields):
ansible_hash = hashlib.md5(repr(sorted(fields.items()))).hexdigest()
quick_update = (o.last_ansible_hash == ansible_hash)
@@ -257,12 +174,10 @@
logger.info("quick_update triggered; skipping ansible recipe",extra=o.tologdict())
else:
if o.instance.isolation in ["container", "container_vm"]:
+ raise Exception("probably not implemented")
super(SyncVSGTenant, self).run_playbook(o, fields, "sync_vcpetenant_new.yaml")
else:
- if CORD_USE_VTN:
- super(SyncVSGTenant, self).run_playbook(o, fields, template_name="sync_vcpetenant_vtn.yaml")
- else:
- super(SyncVSGTenant, self).run_playbook(o, fields)
+ super(SyncVSGTenant, self).run_playbook(o, fields, template_name="sync_vcpetenant_vtn.yaml")
o.last_ansible_hash = ansible_hash