commit 4a503b1b222a52d13b9380fbca398d1ef6ac3cf9
author Andy Bavier <andy@onlab.us> Tue Jun 21 11:41:29 2016 -0400
committer Andy Bavier <andy@onlab.us> Tue Jun 21 12:13:36 2016 -0400
tree 5c9c756b928393718ac7012508d28d9f1f282ef9
parent e60437ee4b61d8467bfd2bd4ebe4f1fc96489fbe

Changes from feature/cord-pod-deploy branch of XOS repo

Change-Id: I67a1b4aa8e0da491bf0a5eff9ec05aa7cb04567d

xos/synchronizer/steps/sync_onosapp.py

diff --git a/xos/synchronizer/steps/sync_onosapp.py b/xos/synchronizer/steps/sync_onosapp.py
index 78a8cc8..d421aa1 100644
--- a/xos/synchronizer/steps/sync_onosapp.py
+++ b/xos/synchronizer/steps/sync_onosapp.py
@@ -178,7 +178,7 @@
 
         data = {
             "apps" : {
-                "org.onosproject.cordvtn" : {
+                "org.opencord.vtn" : {
                     "cordvtn" : {
                         "privateGatewayMac" : privateGatewayMac,
                         "localManagementIp": localManagementIp,
@@ -206,7 +206,7 @@
             }
         }
 
-        # Generate apps->org.onosproject.cordvtn->cordvtn->nodes
+        # Generate apps->org.opencord.vtn->cordvtn->nodes
         nodes = Node.objects.all()
         for node in nodes:
             nodeip = socket.gethostbyname(node.name)
@@ -226,7 +226,7 @@
                 "dataPlaneIntf": dataPlaneIntf,
                 "dataPlaneIp": dataPlaneIp
             }
-            data["apps"]["org.onosproject.cordvtn"]["cordvtn"]["nodes"].append(node_dict)
+            data["apps"]["org.opencord.vtn"]["cordvtn"]["nodes"].append(node_dict)
 
         # Generate apps->org.onosproject.cordvtn->cordvtn->publicGateways
         # Pull the gateway information from vRouter
@@ -239,7 +239,7 @@
                     "gatewayIp": gatewayIp,
                     "gatewayMac": gatewayMac
                 }
-                data["apps"]["org.onosproject.cordvtn"]["cordvtn"]["publicGateways"].append(gateway_dict)
+                data["apps"]["org.opencord.vtn"]["cordvtn"]["publicGateways"].append(gateway_dict)
 
         return json.dumps(data, indent=4, sort_keys=True)
 
@@ -491,6 +491,11 @@
         else:
             fields["dependencies"] = []
 
+        if o.install_dependencies:
+            fields["install_dependencies"] = [x.strip() for x in o.install_dependencies.split(",")]
+        else:
+            fields["install_dependencies"] = []
+
         return fields
 
     def get_extra_attributes_full(self, o):
@@ -503,11 +508,6 @@
         fields["component_configs"] = o.component_configs
         fields["node_key_fn"] = o.node_key_fn
 
-        if o.install_dependencies:
-            fields["install_dependencies"] = [x.strip() for x in o.install_dependencies.split(",")]
-        else:
-            fields["install_dependencies"] = []
-
         if (instance.isolation=="container"):
             fields["ONOS_container"] = "%s-%s" % (instance.slice.name, str(instance.id))
         else: