commit c3a63c3cfabc44fa95bc35b10da8528061d2573f
author Andy Bavier <acb@cs.princeton.edu> Thu Jun 02 15:50:55 2016 -0400
committer Andy Bavier <acb@cs.princeton.edu> Thu Jun 02 15:50:55 2016 -0400
tree f047e70e2326c724f79750b7d655ab40c94f46a0
parent 0456e9b037eadd79a3bbf57775b49f810ecaf39d

Fixes

xos/configurations/cord-pod/make-fabric-yaml.sh

diff --git a/xos/configurations/cord-pod/make-fabric-yaml.sh b/xos/configurations/cord-pod/make-fabric-yaml.sh
index 541f5fd..d844459 100644
--- a/xos/configurations/cord-pod/make-fabric-yaml.sh
+++ b/xos/configurations/cord-pod/make-fabric-yaml.sh
@@ -26,7 +26,7 @@
     service#fabric:
       type: tosca.nodes.FabricService
       properties:
-          view_url: /admin/fabric/fabricservice/$id$/
+          view_url: /admin/fabric/fabricservice/\$id\$/
           replaces: service_fabric
 
 
@@ -68,5 +68,4 @@
               relationship: tosca.relationships.UsedByService
       properties:
           dependencies:
-          autogenerate: fabric-network-cfg
 EOF

xos/synchronizers/fabric/steps/sync_vsgtenant.py

diff --git a/xos/synchronizers/fabric/steps/sync_vsgtenant.py b/xos/synchronizers/fabric/steps/sync_vsgtenant.py
index 9c1b65e..61439bd 100644
--- a/xos/synchronizers/fabric/steps/sync_vsgtenant.py
+++ b/xos/synchronizers/fabric/steps/sync_vsgtenant.py
@@ -9,6 +9,7 @@
 from core.models import Image, ControllerImages
 from xos.logger import observer_logger as logger
 from synchronizers.base.ansible import *
+from services.cord.models import VSGTenant
 import json
 
 class SyncVSGTenant(SyncStep):
@@ -17,6 +18,12 @@
     requested_interval=30
     playbook='sync_vsgtenant.yaml'
 
+    def get_fabric_onos_service(self):
+
+    def get_node_tag(self, o, node, tagname):
+        tags = Tag.select_by_content_object(node).filter(name=tagname)
+        return tags[0].value
+
     def fetch_pending(self, deleted):
         if (not deleted):
             objs = VSGTenant.get_tenant_objects().filter(Q(lazy_blocked=False))
@@ -34,6 +41,8 @@
         wan_mac = vsgtenant.wan_container_mac
 
         # Look up location - it's tagged on the nodes
+        node = vsgtenant.instance.node
+        location = self.get_node_tag(o, node, "location")
 
         # Figure out: is it a POST or DELETE?