Merge "Added RRU port configuraiton"
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"
diff --git a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index 0f9ddb0..afed8f9 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -24,11 +24,61 @@
   - custom_types/attworkflowdriverservice.yaml
   - custom_types/serviceinstanceattribute.yaml
   - custom_types/onosapp.yaml
+  - custom_types/onosservice.yaml
+  - custom_types/serviceinstanceattribute.yaml
 
 description: Configures the ONF SEBA POD with AT&T workflow
 
 topology_template:
   node_templates:
+    # ONOS Apps for tech-profiles
+    service#onos:
+      type: tosca.nodes.ONOSService
+      properties:
+          name: onos
+          must-exist: true
+
+    onos_app#sadis:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: sadis
+        must-exist: true
+      requirements:
+        - owner:
+            node: service#onos
+            relationship: tosca.relationships.BelongsToOne
+
+    sadis-config-attr:
+      type: tosca.nodes.ServiceInstanceAttribute
+      properties:
+        name: /onos/v1/network/configuration/apps/org.opencord.sadis
+        value: >
+          {
+            "sadis" : {
+              "integration" : {
+                "cache" : {
+                  "maxsize" : 1000,
+                  "ttl": "PT300S"
+                },
+                "url" : "http://sadis-service:8000/subscriber/%s"
+              }
+            },
+            "bandwidthprofile":{
+               "integration":{
+                  "url": "http://sadis-service:8000/bandwidthprofiles/%s",
+                  "cache":{
+                     "enabled":true,
+                     "maxsize":40,
+                     "ttl":"PT1m"
+                  }
+               }
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#sadis
+            relationship: tosca.relationships.BelongsToOne
+
     # Fabric configuration
     switch#leaf_1:
       type: tosca.nodes.Switch
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