Merge "Add property to create service topology" into casablanca

diff --git a/volumes/so/config/bpmn-infra/onapheat/override.yaml b/volumes/so/config/bpmn-infra/onapheat/override.yaml
index f3778b2..43aa48f 100644 (file)
--- a/volumes/so/config/bpmn-infra/onapheat/override.yaml
+++ b/volumes/so/config/bpmn-infra/onapheat/override.yaml
@@ -234,6 +234,9 @@ mso:
       endpoint: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/WorkflowMessage
     notification:
       name: GenericNotificationServiceATT
+    sdnc:
+      replication:
+        delay: PT60S
     sdncadapter:
       callback: http://c1.vm1.mso.simpledemo.onap.org:8081/mso/SDNCAdapterCallbackService
     vnfadapter:

diff --git a/volumes/so/config/sdnc-adapter/onapheat/override.yaml b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
index abb06e4..e7bb388 100644 (file)
--- a/volumes/so/config/sdnc-adapter/onapheat/override.yaml
+++ b/volumes/so/config/sdnc-adapter/onapheat/override.yaml
@@ -24,6 +24,13 @@ org:
                         query: GET|60000|sdncurl2|
                         restdelete: DELETE|60000|sdncurl5|
                     '':
+                        brg-topology-operation:
+                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
                         contrail-route-topology-operation:
                             activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
                             assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
@@ -64,6 +71,13 @@ org:
                             activate: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
                             assign: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
                             delete: POST|285000|sdncurl8|sdnc-request-header|com:att:sdnctl:nbncapi
+                        tunnelxconn-topology-operation:
+                            activate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            assign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            create: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            deactivate: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            delete: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
+                            unassign: POST|270000|sdncurl10|sdnc-request-header|org:onap:sdnc:northbound:generic-resource
                         vnf-topology-operation:
                             activate: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf
                             assign: POST|270000|sdncurl6|sdnc-request-header|org:onap:sdnctl:vnf