synchronizer run and config options
diff --git a/xos/configurations/cord-pod/Makefile b/xos/configurations/cord-pod/Makefile
index ae7187a..580ecbd 100644
--- a/xos/configurations/cord-pod/Makefile
+++ b/xos/configurations/cord-pod/Makefile
@@ -27,6 +27,7 @@
sudo cp id_rsa.pub key_import/volt_rsa.pub
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/volt/volt-onboard.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/onboard/vsg/vsg-onboard.yaml
+ sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/cord-pod/synchronizers.yaml
sudo docker-compose -p $(DOCKER_PROJECT) -f $(BOOTSTRAP_YML) run xos_bootstrap_ui python /opt/xos/tosca/run.py None /opt/xos/configurations/cord-pod/enable-onboarding.yaml
bash ../common/wait_for_onboarding_ready.sh 81 services/volt
bash ../common/wait_for_onboarding_ready.sh 81 services/vsg
diff --git a/xos/configurations/cord-pod/synchronizers.yaml b/xos/configurations/cord-pod/synchronizers.yaml
index a20f459..1e001b7 100644
--- a/xos/configurations/cord-pod/synchronizers.yaml
+++ b/xos/configurations/cord-pod/synchronizers.yaml
@@ -11,4 +11,4 @@
type: tosca.nodes.ServiceController
properties:
no-create: true
- synchronizer_config: /root/setup/files/vsg_synchronizer_config
\ No newline at end of file
+ synchronizer_config: /root/setup/files/vcpe_synchronizer_config
diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index 9f7c8e6..829a8df 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -108,6 +108,9 @@
format = StrippedCharField(choices=FORMAT_CHOICES, max_length=30)
url = StrippedCharField(max_length=1024, help_text="URL of resource", null=True, blank=True)
+ synchronizer_run = StrippedCharField(max_length=1024, help_text="synchronizer run command", null=True, blank=True)
+ synchronizer_config = StrippedCharField(max_length=1024, help_text="synchronizer config file", null=True, blank=True)
+
def __unicode__(self): return u'%s' % (self.name)
@property
diff --git a/xos/onboard/vsg/vsg-onboard.yaml b/xos/onboard/vsg/vsg-onboard.yaml
index cac45bf..48f6ad4 100644
--- a/xos/onboard/vsg/vsg-onboard.yaml
+++ b/xos/onboard/vsg/vsg-onboard.yaml
@@ -17,6 +17,7 @@
admin: admin.py
admin_template: templates/vcpeadmin.html
synchronizer: synchronizer/manifest
+ synchronizer_run: vcpe-synchronizer.py
#tosca_custom_types: exampleservice.yaml
tosca_resource: tosca/resources/vcpeservice.py
rest_service: subdirectory:vsg api/service/vsg/vsgservice.py
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 9ed62ed..ef852af 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -84,6 +84,14 @@
type: string
required: false
description: url of synchronizer manifest
+ synchronizer_run:
+ type: string
+ required: false
+ description: synchronizer run command
+ synchronizer_config:
+ type: string
+ required: false
+ description: synchronizer config filename
tosca_custom_types:
type: string
required: false
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 79e637b..93dad18 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -192,6 +192,14 @@
type: string
required: false
description: url of synchronizer manifest
+ synchronizer_run:
+ type: string
+ required: false
+ description: synchronizer run command
+ synchronizer_config:
+ type: string
+ required: false
+ description: synchronizer config filename
tosca_custom_types:
type: string
required: false
diff --git a/xos/tosca/resources/servicecontroller.py b/xos/tosca/resources/servicecontroller.py
index ce350de..98a1a67 100644
--- a/xos/tosca/resources/servicecontroller.py
+++ b/xos/tosca/resources/servicecontroller.py
@@ -12,7 +12,7 @@
class XOSServiceController(XOSResource):
provides = "tosca.nodes.ServiceController"
xos_model = ServiceController
- copyin_props = ["base_url"]
+ copyin_props = ["base_url", "synchronizer_run", "synchronizer_config"]
def postprocess_resource_prop(self, obj, kind, format):
values = self.get_property(kind)