add c_tag and s_tag to TOSCA; remove vlan_id
diff --git a/xos/configurations/cord/cord.yaml b/xos/configurations/cord/cord.yaml
index 67d8bb6..8945eea 100644
--- a/xos/configurations/cord/cord.yaml
+++ b/xos/configurations/cord/cord.yaml
@@ -456,7 +456,8 @@
type: tosca.nodes.VOLTTenant
properties:
service_specific_id: 123
- vlan_id: 432
+ s_tag: 222
+ c_tag: 432
requirements:
- provider_service:
node: service_volt
diff --git a/xos/tosca/custom_types/xos.m4 b/xos/tosca/custom_types/xos.m4
index 88d8f5f..aca3e3e 100644
--- a/xos/tosca/custom_types/xos.m4
+++ b/xos/tosca/custom_types/xos.m4
@@ -236,10 +236,14 @@
specific vlan_id.
properties:
xos_base_tenant_props
- vlan_id:
+ s_tag:
type: string
required: false
- description: vlan_id for connection to subscriber household.
+ description: s_tag, identifies which volt port
+ c_tag:
+ type: string
+ required: false
+ description: c_tag, identifies which subscriber within s_tag
tosca.nodes.User:
derived_from: tosca.nodes.Root
diff --git a/xos/tosca/custom_types/xos.yaml b/xos/tosca/custom_types/xos.yaml
index 4352ef5..63b4e0c 100644
--- a/xos/tosca/custom_types/xos.yaml
+++ b/xos/tosca/custom_types/xos.yaml
@@ -364,10 +364,14 @@
type: string
required: false
description: Service specific ID opaque to XOS but meaningful to service
- vlan_id:
+ s_tag:
type: string
required: false
- description: vlan_id for connection to subscriber household.
+ description: s_tag, identifies which volt port
+ c_tag:
+ type: string
+ required: false
+ description: c_tag, identifies which subscriber within s_tag
tosca.nodes.User:
derived_from: tosca.nodes.Root
diff --git a/xos/tosca/resources/VOLTTenant.py b/xos/tosca/resources/VOLTTenant.py
index f00b515..89c24e3 100644
--- a/xos/tosca/resources/VOLTTenant.py
+++ b/xos/tosca/resources/VOLTTenant.py
@@ -14,7 +14,7 @@
class XOSVOLTTenant(XOSResource):
provides = "tosca.nodes.VOLTTenant"
xos_model = VOLTTenant
- copyin_props = ["service_specific_id", "vlan_id"]
+ copyin_props = ["service_specific_id", "s_tag", "c_tag"]
name_field = None
def get_xos_args(self, throw_exception=True):
diff --git a/xos/tosca/samples/cord.yaml b/xos/tosca/samples/cord.yaml
index 477be2f..567ced0 100644
--- a/xos/tosca/samples/cord.yaml
+++ b/xos/tosca/samples/cord.yaml
@@ -125,7 +125,8 @@
type: tosca.nodes.VOLTTenant
properties:
service_specific_id: 1234
- vlan_id: 4321
+ s_tag: 222
+ c_tag: 432
requirements:
- provider_service:
node: service_volt