diff options
| author |   Zhuangyang <418624178@qq.com> | 2021-08-22 11:13:46 +0800 |
|---|---|---|
| committer | Zhuangyang <418624178@qq.com> | 2021-08-22 11:13:46 +0800 |
| commit | 4308ac023373157f4255088efba7cdb34115bff7 (patch) | |
| tree | c7a1d3e0b179ae7b89b2dbe5bed87a193e3c46aa /platform-logic/generic-resource-api/src/main | |
| parent | 0ee0c5b0c15dd310f316e795a700150d6de5e394 (diff) | |
New DGs added for CCVPN scenario enhancement.
Fix DGs URL and add rest-api template
Issue-ID: CCSDK-3389
Signed-off-by: zychen <418624178@qq.com>
Change-Id: I0d77a0ffe2b20e55a8cb21a2771838b19013515f
Former-commit-id: 929ae023c5e20f3a8e95cbef72647184f8ec3c67
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
2 files changed, 18 insertions, 20 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_performance-data-collector.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_performance-data-collector.json index 9b89daac..fb5ec10a 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_performance-data-collector.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_performance-data-collector.json @@ -91,26 +91,26 @@ "id": "57ac747a.c5062c", "type": "execute", "name": "execute RestApiCallNode to performance-data-collector", - "xml": "<execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\n<parameter name="\"templateFileName\"" value="\"`$tmp.templateFileName`\"">\n<parameter name="\"restapiUrl\"" value="\"`$prop.sdncRestApi.thirdpartySdnc.url" +="" $tmp.restapiurl`\"="">\n<parameter name="\"restapiUser\"" value="\"`$prop.sdncRestApi.thirdpartySdnc.user`\"">\n<parameter name="\"restapiPassword\"" value="\"`$prop.sdncRestApi.thirdpartySdnc.password`\"">\n<parameter name="\"format\"" value="\"json\"/">\n<parameter name="\"httpMethod\"" value="\"post\"/">\n<parameter name="\"responsePrefix\"" value="\"restApi-result\"/">", - "comments": "", - "outputs": 1, - "x": 329.5992431640625, - "y": 962.920654296875, - "z": "f85a283.735a0d8", - "wires": [ + "xml": "<execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\n<parameter name="\"templateFileName\"" value="\"`$tmp.templateFileName`\"">\n<parameter name="\"restapiUrl\"" value="\"`'http://'" +="" $collect-performace-data-input.controller-ipv4-address="" ':8181="" restconf="" data="" ietf-service-pm:performance-monitoring="" service-pm=" + $collect-performace-data-input.service-name `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restApi-result\"/>", + "comments": "", + "outputs": 1, + "x": 329.5992431640625, + "y": 962.920654296875, + "z": "f85a283.735a0d8", + "wires": [ [ - "a89016ec.95b9f8", - "dbad8b12.6a55c8", - "522d781.14b7388", - "7c72a790.675628" + "a89016ec.95b9f8", + "dbad8b12.6a55c8", + "522d781.14b7388", + "7c72a790.675628" ] ] }, { - "id": "522d781.14b7388", - "type": "not-found", - "name": "not-found", - "xml": "<outcome value="not-found">\n", + "id": "522d781.14b7388", + "type": "not-found", + "name": "not-found", + "xml": "<outcome value=" not-found'="">\n", "comments": "", "outputs": 1, "x": 1052.3556938171387, @@ -234,4 +234,4 @@ [] ] } -]</record></record></parameter></parameter></return></parameter></return></execute></parameter></parameter></parameter></return></outcome></outcome></outcome></parameter></parameter></parameter></parameter></parameter></parameter></parameter></execute></parameter></return></parameter></set></block></method></service-logic>
\ No newline at end of file +]</record></record></parameter></parameter></return></parameter></return></execute></parameter></parameter></parameter></return></outcome></outcome></parameter></parameter></execute></parameter></return></parameter></set></block></method></service-logic>
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_performance-data-collector.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_performance-data-collector.xml index 9741ba38..b069dd14 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_performance-data-collector.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_performance-data-collector.xml @@ -20,10 +20,8 @@ ","comments":"","x":1532.8334693908691,"y":1024.3891944885254,"z":"f85a283.735a0d8","wires":[]},{"id":"57ac747a.c5062c","type":"execute","name":"execute RestApiCallNode to performance-data-collector","xml":" <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest'>\n - <parameter name=\"templateFileName\" value=\"`$tmp.templateFileName`\" />\n<parameter name= - \"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + $tmp.restapiUrl`\" />\n<parameter - name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter - name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n + <parameter name="restapiUrl" + value="`'http://' + $collect-performace-data-input.controller-ipv4-address + ':8181/restconf/data/ietf-service-pm:performance-monitoring/service-pm=' + $collect-performace-data-input.service-name `"/> <parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n <parameter name=\"responsePrefix\" value=\"restApi-result\"/>","comments":"","outputs":1,"x":329.5992431640625,"y":962.920654296875,"z":"f85a283.735a0d8","wires":[["a89016ec.95b9f8","dbad8b12.6a55c8","522d781.14b7388","7c72a790.675628"]]},{"id":"522d781.14b7388","type":"not-found","name":"not-found","xml":" |