commit bf8ba14677eb9da4db30cb5f3de7a3a3d82390b8
author Scott Baker <scottb@onlab.us> Mon Oct 15 20:09:23 2018 +0000
committer Gerrit Code Review <gerrit@opencord.org> Mon Oct 15 20:09:23 2018 +0000
tree 574022510a18c6b539bb42d7b3641d00fa14d3dc
parent cc7f3bf9686600524305a2c5ed0a10c072d7208d
parent 0090aef5b8d3b61ac88c0e640ab5b4241b864094

Merge "back to master voltha images"

tosca-configs/att-workflow/bbwf-fabric.yaml

diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index db2ef67..2250538 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -190,11 +190,11 @@
             relationship: tosca.relationships.BelongsToOne
 
     # ONUs connected to CIG OLT
-    CIG:
+    CIGG18a00002:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: CIG
-        pon_port_id: 536870912
+        serial_number: CIGG18a00002
+        pon_port_id: 536870913
         device_id: of:00000000C0A86471
       requirements:
         - owner:

tosca-configs/att-workflow/bbwf-subscriber.yaml

diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index fa32b21..2591811 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -77,11 +77,11 @@
     cig_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: Sub_CIG
+        name: Sub_CIGG18a00002
         status: pre-provisioned
         c_tag: 11
         s_tag: 333
-        onu_device: CIG
+        onu_device: CIGG18a00002
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: cig_sub1_circuit
         remote_id: cig_sub1_remote