Merge "voltha debug"
diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index c437171..f311ce3 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-fabric.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-fabric.yaml http://10.90.0.101:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -23,7 +23,7 @@
- custom_types/attworkflowdriverwhitelistentry.yaml
- custom_types/attworkflowdriverservice.yaml
-description: Configures the ONF SEBA POD with AT&T workflow
+description: Configures the EdgeCore SEBA POD with AT&T workflow
topology_template:
node_templates:
@@ -76,12 +76,34 @@
name: att-workflow-driver
must-exist: true
+ ISKT71E81130:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT71E81130
+ pon_port_id: 536870912
+ device_id: of:00000000c0a863b6
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
+ ISKT71E81050:
+ type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+ properties:
+ serial_number: ISKT71E81050
+ pon_port_id: 536870913
+ device_id: of:00000000c0a863b6
+ requirements:
+ - owner:
+ node: service#att
+ relationship: tosca.relationships.BelongsToOne
+
ISKT71E810C0:
type: tosca.nodes.AttWorkflowDriverWhiteListEntry
properties:
serial_number: ISKT71E810C0
- pon_port_id: 536870912
- device_id: of:000000000a5a0072
+ pon_port_id: 536870913
+ device_id: of:00000000c0a863b6
requirements:
- owner:
node: service#att
diff --git a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
index 4f1680b..8040f7d 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-olt.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-olt.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-edgecore-olt.yaml http://10.90.0.101:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index 8e6d73b..f53095e 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onlab-pod1-subscriber.yaml http://10.90.0.101:30007/run
+# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @edgecore-pod1-subscriber.yaml http://10.90.0.101:30007/run
tosca_definitions_version: tosca_simple_yaml_1_0
imports:
@@ -23,14 +23,38 @@
topology_template:
node_templates:
- ISK1:
+ ISKT71E81130:
type: tosca.nodes.RCORDSubscriber
properties:
- name: Client1
+ name: ISKT71E81130
status: pre-provisioned
- c_tag: 112
s_tag: 111
+ c_tag: 11
+ onu_device: ISKT71E81130
+ nas_port_id : "nas-port-id-ISKT71E81130"
+ circuit_id: "circuit-id-ISKT71E81130"
+ remote_id: "remote-id-ISKT71E81130"
+
+ ISKT71E81050:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: ISKT71E81050
+ status: pre-provisioned
+ s_tag: 111
+ c_tag: 12
+ onu_device: ISKT71E81050
+ nas_port_id : "nas-port-id-ISKT71E81050"
+ circuit_id: "circuit-id-ISKT71E81050"
+ remote_id: "remote-id-ISKT71E81050"
+
+ ISKT71E81130:
+ type: tosca.nodes.RCORDSubscriber
+ properties:
+ name: ISKT71E810C0
+ status: pre-provisioned
+ s_tag: 111
+ c_tag: 13
onu_device: ISKT71E810C0
- nas_port_id : "PON 1/1/04/1:1.1.1"
- circuit_id: foo1
- remote_id: bar1
+ nas_port_id : "nas-port-id-ISKT71E810C0"
+ circuit_id: "circuit-id-ISKT71E810C0"
+ remote_id: "remote-id-ISKT71E810C0"