diff options
| author |   Dan Timoney <dtimoney@att.com> | 2020-05-14 12:43:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-14 12:43:49 +0000 |
| commit | 4f07c48d03f9bbe6d1a367594d719a19cfee0959 (patch) | |
| tree | b7bfb27538b44c2532654276b5470a9593666a88 /platform-logic | |
| parent | 45668145649102a2b1b2378e682c8e23f756a8b8 (diff) | |
| parent | baa546ffb1fcc4fcfbba13b05511b6c85df8d302 (diff) | |
Merge "MSA delete services issues fixed for MDONS use case"
Former-commit-id: a8398eef1ac270ab7a145e812856b62171af8b6f
Diffstat (limited to 'platform-logic')
4 files changed, 8 insertions, 8 deletions
diff --git a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json index eb7a20c6..a3b5d401 100644 --- a/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json +++ b/platform-logic/optical-service/src/main/json/optical-service_service-delete-msa.json @@ -382,11 +382,11 @@ "id": "4f7b81dc.d4d6f",
"type": "set",
"name": "set domain-services",
- "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$service-name + $param-prefix[2]`\"/>",
+ "xml": "<set>\n<parameter name='domain-type' value='`$param-prefix[0]`' />\n<parameter name='controller-ip' value='`$param-prefix[1]`' />\n<parameter name='optical-service-delete-input.request-id' value=\"`$domain-service1`\" />\n<parameter name='optical-service-delete-input.payload.service-name' value=\"`$optical-service-delete-input.payload.service-name + $param-prefix[2]`\"/>",
"comments": "",
"x": 777.61669921875,
"y": 244.61666870117188,
"z": "27c6cdb6.f4809a",
"wires": []
}
-]
\ No newline at end of file +]
diff --git a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml index 2eb38164..a04cdba5 100644 --- a/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml +++ b/platform-logic/optical-service/src/main/xml/optical-service_service-delete-msa.xml @@ -23,7 +23,7 @@ pfx='detail-db1'> <parameter name='domain-type' value='`$param-prefix[0]`' />
<parameter name='controller-ip' value='`$param-prefix[1]`' />
<parameter name='optical-service-delete-input.request-id' value="`$domain-service1`" />
- <parameter name='optical-service-delete-input.payload.service-name' value="`$service-name + $param-prefix[2]`"/>
+ <parameter name='optical-service-delete-input.payload.service-name' value="`$optical-service-delete-input.payload.service-name + $param-prefix[2]`"/>
</set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/optical-service-delete-msa.json'`" />
@@ -87,4 +87,4 @@ pfx='output'></get-resource> </execute>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic>
diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json index cd26b7e6..8806f4b8 100644 --- a/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json +++ b/platform-logic/restapi-templates/src/main/json/optical-service-create-msa.json @@ -5,8 +5,8 @@ "sdnc-request-header":{ "request-id": ${optical-service-create-input.request-id}, "rpc-action":"service-create", - "notification-url": ${notification-url}, - "request-system-id":"SDN-ONAP" + "notification-url": "http://sdnc.onap:8090/receiver/services", + "request-system-id":"DCAE" }, "service-a-end":{ "service-rate": ${optical-service-create-input.payload.service-rate}, diff --git a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json index e777f99a..63f6b8aa 100644 --- a/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json +++ b/platform-logic/restapi-templates/src/main/json/optical-service-delete-msa.json @@ -2,8 +2,8 @@ "sdnc-request-header":{ "request-id": ${optical-service-delete-input.request-id}, "rpc-action": "service-delete", - "notification-url": ${notification-url}, - "request-system-id": "SDN-ONAP" + "notification-url": "http://sdnc.onap:8090/receiver/services", + "request-system-id": "DCAE" }, "service-delete-req-info":{ "tail-retention": "no", |