commit 2003cd82b30a0dcdf2f14e1cb93d390c8107d437
author Scott Baker <smbaker@gmail.com> Mon Aug 10 17:08:54 2015 -0700
committer Scott Baker <smbaker@gmail.com> Mon Aug 10 17:08:54 2015 -0700
tree d8e2856832d7d20a5878e056b1bb51bf8b342aca
parent 2142bd7dca10bea694beccecc1a43881a85fc873

add icon_url/view_url, Service objs for VBNG, VCPE, and CDN

xos/tosca/custom_types/xos.m4

diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 35af5d3..2d3cf22 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -21,6 +21,9 @@
 define(xos_base_service_props,
             view_url:
                 type: string
+                required: false
+            icon_url:
+                type: string
                 required: false)
 
 # end m4 macros
@@ -35,7 +38,7 @@
         properties:
             xos_base_service_props
 
-    tosca.nodes.VcpeService:
+    tosca.nodes.VCPEService:
         derived_from: tosca.nodes.Root
         capabilities:
             xos_base_service_caps
@@ -45,6 +48,23 @@
                 type: string
                 required: false
 
+    tosca.nodes.VBNGService:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            xos_base_service_caps
+        properties:
+            xos_base_service_props
+            vbng_url:
+                type: string
+                required: false
+
+    tosca.nodes.CDNService:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            xos_base_service_caps
+        properties:
+            xos_base_service_props
+
     tosca.nodes.User:
         derived_from: tosca.nodes.Root
 

xos/tosca/custom_types/xos.yaml

diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 16a120f..22419c5 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -24,8 +24,11 @@
             view_url:
                 type: string
                 required: false
+            icon_url:
+                type: string
+                required: false
 
-    tosca.nodes.VcpeService:
+    tosca.nodes.VCPEService:
         derived_from: tosca.nodes.Root
         capabilities:
             scalable:
@@ -36,10 +39,46 @@
             view_url:
                 type: string
                 required: false
+            icon_url:
+                type: string
+                required: false
             backend_network_label:
                 type: string
                 required: false
 
+    tosca.nodes.VBNGService:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service
+        properties:
+            view_url:
+                type: string
+                required: false
+            icon_url:
+                type: string
+                required: false
+            vbng_url:
+                type: string
+                required: false
+
+    tosca.nodes.CDNService:
+        derived_from: tosca.nodes.Root
+        capabilities:
+            scalable:
+                type: tosca.capabilities.Scalable
+            service:
+                type: tosca.capabilities.xos.Service
+        properties:
+            view_url:
+                type: string
+                required: false
+            icon_url:
+                type: string
+                required: false
+
     tosca.nodes.User:
         derived_from: tosca.nodes.Root