commit 6dc685ba815d6d159afe2c0ac759dd6e0dc54a68
author Andy Bavier <acb@cs.princeton.edu> Wed Apr 27 17:09:48 2016 -0400
committer Andy Bavier <acb@cs.princeton.edu> Wed Apr 27 17:09:48 2016 -0400
tree 1916aefc398e595f78ab52a379d446419c323acc
parent d18ebdfcb55749f8551fe84d243dbd5eb8cda71d

Use single autogenerate attribute

xos/configurations/cord-pod/cord-vtn-vsg.yaml

diff --git a/xos/configurations/cord-pod/cord-vtn-vsg.yaml b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
index 39f03bd..ca7f6ad 100644
--- a/xos/configurations/cord-pod/cord-vtn-vsg.yaml
+++ b/xos/configurations/cord-pod/cord-vtn-vsg.yaml
@@ -80,8 +80,7 @@
       properties:
           install_dependencies: onos-ext-notifier-1.0-SNAPSHOT.oar, onos-ext-volt-event-publisher-1.0-SNAPSHOT.oar
           dependencies: org.onosproject.openflow-base, org.onosproject.olt, org.ciena.onos.ext_notifier, org.ciena.onos.volt_event_publisher
-          autogenerate: volt-network-cfg
-          autogenerate: volt-component-cfg
+          autogenerate: volt-network-cfg, volt-component-cfg
 
     Private:
       type: tosca.nodes.NetworkTemplate

xos/synchronizers/onos/steps/sync_onosapp.py

diff --git a/xos/synchronizers/onos/steps/sync_onosapp.py b/xos/synchronizers/onos/steps/sync_onosapp.py
index 0916290..d1b3650 100644
--- a/xos/synchronizers/onos/steps/sync_onosapp.py
+++ b/xos/synchronizers/onos/steps/sync_onosapp.py
@@ -311,11 +311,13 @@
             o.early_rest_configs.append( {"endpoint": endpoint, "fn": fn} )
 
         # Generate config files and save them to the appropriate tenant attributes
-        autogen = []
+        configs = []
         for key, value in attrs.iteritems():
             if key == "autogenerate" and value:
-                autogen.append(value)
-        for label in autogen:
+                for config in value.split(','):
+                    configs.append(config.strip())
+
+        for label in configs:
             config = None
             value = None
             if label == "vtn-network-cfg":