commit 579f819b0947e64ace574f1d3da987f762d21ede
author Scott Baker <smbaker@gmail.com> Tue Sep 01 10:40:49 2015 -0700
committer Scott Baker <smbaker@gmail.com> Tue Sep 01 10:40:49 2015 -0700
tree 7fd0fc6edaf17217d22b72becfff4e983d59673d
parent c4c746c53a9c7b51b5b8d3077a618e637b0b6192

fill out the remaining copyin properties for server objects

xos/tosca/custom_types/xos.m4

diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 9ba9973..790d5eb 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -36,6 +36,9 @@
                 default: true
             public_key:
                 type: string
+                required: false
+            versionNumber:
+                type: string
                 required: false)
 
 # end m4 macros

xos/tosca/resources/vbngservice.py

diff --git a/xos/tosca/resources/vbngservice.py b/xos/tosca/resources/vbngservice.py
index 70f47aa..1fc8d25 100644
--- a/xos/tosca/resources/vbngservice.py
+++ b/xos/tosca/resources/vbngservice.py
@@ -12,5 +12,5 @@
 class XOSVBGNService(XOSService):
     provides = "tosca.nodes.VBNGService"
     xos_model = VBNGService
-    copyin_props = ["view_url", "icon_url", "vnbg_url"]
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", "vbng_url"]
 

xos/tosca/resources/vcpeservice.py

diff --git a/xos/tosca/resources/vcpeservice.py b/xos/tosca/resources/vcpeservice.py
index e163520..6cc7390 100644
--- a/xos/tosca/resources/vcpeservice.py
+++ b/xos/tosca/resources/vcpeservice.py
@@ -12,5 +12,5 @@
 class XOSVcpeService(XOSService):
     provides = "tosca.nodes.VCPEService"
     xos_model = VCPEService
-    copyin_props = ["view_url", "icon_url", "backend_network_label", "enabled", "published", "public_key"]
+    copyin_props = ["view_url", "icon_url", "enabled", "published", "public_key", "versionNumber", "backend_network_label"]