added tosca.nodes.ONOSvOLTApp
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 7a94d8b..055817d 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -111,7 +111,7 @@
tosca.nodes.ONOSvBNGApp:
derived_from: tosca.nodes.Root
description: >
- An ONOS Application.
+ An ONOS vBNG Application.
properties:
xos_base_tenant_props
dependencies:
@@ -124,6 +124,16 @@
type: string
required: false
+ tosca.nodes.ONOSvOLTApp:
+ derived_from: tosca.nodes.Root
+ description: >
+ An ONOS vOLT Application.
+ properties:
+ xos_base_tenant_props
+ dependencies:
+ type: string
+ required: false
+
tosca.nodes.VCPEService:
description: >
CORD: The vCPE Service.
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 9b307d6..409e86b 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -115,7 +115,7 @@
tosca.nodes.ONOSvBNGApp:
derived_from: tosca.nodes.Root
description: >
- An ONOS Application.
+ An ONOS vBNG Application.
properties:
kind:
type: string
@@ -135,6 +135,23 @@
type: string
required: false
+ tosca.nodes.ONOSvOLTApp:
+ derived_from: tosca.nodes.Root
+ description: >
+ An ONOS vOLT Application.
+ properties:
+ kind:
+ type: string
+ default: generic
+ description: Kind of tenant
+ service_specific_id:
+ type: string
+ required: false
+ description: Service specific ID opaque to XOS but meaningful to service
+ dependencies:
+ type: string
+ required: false
+
tosca.nodes.VCPEService:
description: >
CORD: The vCPE Service.
diff --git a/xos/tosca/resources/onosapp.py b/xos/tosca/resources/onosapp.py
index 03c4eb5..111cf9a 100644
--- a/xos/tosca/resources/onosapp.py
+++ b/xos/tosca/resources/onosapp.py
@@ -12,7 +12,7 @@
from xosresource import XOSResource
class XOSONOSApp(XOSResource):
- provides = ["tosca.nodes.ONOSApp", "tosca.nodes.ONOSvBNGApp"]
+ provides = ["tosca.nodes.ONOSApp", "tosca.nodes.ONOSvBNGApp", "tosca.nodes.ONOSvOLTApp"]
xos_model = ONOSApp
copyin_props = ["service_specific_id", "dependencies"]
diff --git a/xos/tosca/samples/onos.yaml b/xos/tosca/samples/onos.yaml
index fc6a3d5..a549515 100644
--- a/xos/tosca/samples/onos.yaml
+++ b/xos/tosca/samples/onos.yaml
@@ -56,6 +56,15 @@
"xosRestPort" : "9999"
}
+ vOLT:
+ type: tosca.nodes.ONOSvOLTApp
+ requirements:
+ - onos_tenant:
+ node: ONOS
+ relationship: tosca.relationships.TenantOfService
+ properties:
+ dependencies: org.onosproject.olt
+
mysite:
type: tosca.nodes.Site