commit 4ce2f3af720d04b6004fc0aa41d8db9c8386f1da
author Wei-Yu Chen <weiyu@opennetworking.org> Wed Apr 17 21:47:46 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Wed Apr 17 21:47:46 2019 +0000
tree 46b4901c7b08ba10434793919de27976bf051e49
parent 7316e5bbf47915018daf287e88c2d29f3e76057a
parent 44cc3c53731a0aad324d1fc9af982795c6a30af4

Merge "Renamed M-CORD local cluster's filename (SEBA configuration)"

kubernetes-configs/onlab-pod1.yml

diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index 8da6cb0..57fe542 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -40,12 +40,13 @@
 
 sadis-server:
   image:
-    repository: opencord/sadis-server
-    tag: latest
+    repository: 10.90.0.101:30500/opencord/sadis-server
+    tag: candidate
 
 rcord:
   image:
-    tag: 1.3.1
+    repository: 10.90.0.101:30500/xosproject/rcord-synchronizer
+    tag: candidate
 
 # # ONOS applications
 aaaAppUrl: "https://oss.sonatype.org/content/repositories/snapshots/org/opencord/aaa/1.9.0-SNAPSHOT/aaa-1.9.0-20190410.071508-31.oar"

tosca-configs/att-workflow/onlab-pod1-subscriber.yaml

diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 5ee3c0c..6b03150 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -17,12 +17,19 @@
 tosca_definitions_version: tosca_simple_yaml_1_0
 imports:
   - custom_types/rcordsubscriber.yaml
+  - custom_types/bandwidthprofile.yaml
 
 description: Pre-provsion a subscriber
 
 topology_template:
   node_templates:
 
+    default_bp:
+      type: tosca.nodes.BandwidthProfile
+      properties:
+         name: Default
+         must-exist: true
+
     # Pre-provision the subscriber the subscriber
     onf_subscriber_1:
       type: tosca.nodes.RCORDSubscriber
@@ -35,6 +42,13 @@
         nas_port_id : "PON 1/1/03/1:1.1.1"
         circuit_id: foo1
         remote_id: bar1
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
 
     onf_subscriber_2:
       type: tosca.nodes.RCORDSubscriber
@@ -47,6 +61,13 @@
         nas_port_id : "PON 1/1/04/1:1.1.1"
         circuit_id: foo2
         remote_id: bar2
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
 
     onf_subscriber_3:
       type: tosca.nodes.RCORDSubscriber
@@ -59,3 +80,10 @@
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: foo3
         remote_id: bar3
+      requirements:
+        - upstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: default_bp
+            relationship: tosca.relationships.BelongsToOne