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

3 files changed, 34 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="\&quot;templateFileName\&quot;" value="\&quot;`$tmp.templateFileName`\&quot;">\n<parameter name="\&quot;restapiUrl\&quot;" value="\&quot;`$prop.sdncRestApi.thirdpartySdnc.url" +="" $tmp.restapiurl`\"="">\n<parameter name="\&quot;restapiUser\&quot;" value="\&quot;`$prop.sdncRestApi.thirdpartySdnc.user`\&quot;">\n<parameter name="\&quot;restapiPassword\&quot;" value="\&quot;`$prop.sdncRestApi.thirdpartySdnc.password`\&quot;">\n<parameter name="\&quot;format\&quot;" value="\&quot;json\&quot;/">\n<parameter name="\&quot;httpMethod\&quot;" value="\&quot;post\&quot;/">\n<parameter name="\&quot;responsePrefix\&quot;" value="\&quot;restApi-result\&quot;/">",
-        "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="\&quot;templateFileName\&quot;" value="\&quot;`$tmp.templateFileName`\&quot;">\n<parameter name="\&quot;restapiUrl\&quot;" value="\&quot;`'http://'" +="" $collect-performace-data-input.controller-ipv4-address="" ':8181="" restconf="" data="" ietf-service-pm:performance-monitoring="" service-pm=" + $collect-performace-data-input.service-name `\&quot; />\n<parameter name=\&quot;restapiUser\&quot; value=\&quot;`$prop.sdncRestApi.thirdpartySdnc.user`\&quot; />\n<parameter name=\&quot;restapiPassword\&quot; value=\&quot;`$prop.sdncRestApi.thirdpartySdnc.password`\&quot; />\n<parameter name=\&quot;format\&quot; value=\&quot;json\&quot;/>\n<parameter name=\&quot;httpMethod\&quot; value=\&quot;post\&quot;/>\n<parameter name=\&quot;responsePrefix\&quot; value=\&quot;restApi-result\&quot;/>&quot;,
+        &quot;comments&quot;: &quot;&quot;,
+        &quot;outputs&quot;: 1,
+        &quot;x&quot;: 329.5992431640625,
+        &quot;y&quot;: 962.920654296875,
+        &quot;z&quot;: &quot;f85a283.735a0d8&quot;,
+        &quot;wires&quot;: [
             [
-                "a89016ec.95b9f8",
-                "dbad8b12.6a55c8",
-                "522d781.14b7388",
-                "7c72a790.675628"
+                &quot;a89016ec.95b9f8&quot;,
+                &quot;dbad8b12.6a55c8&quot;,
+                &quot;522d781.14b7388&quot;,
+                &quot;7c72a790.675628&quot;
             ]
         ]
     },
     {
-        "id": "522d781.14b7388",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value="not-found">\n",
+        &quot;id&quot;: &quot;522d781.14b7388&quot;,
+        &quot;type&quot;: &quot;not-found&quot;,
+        &quot;name&quot;: &quot;not-found&quot;,
+        &quot;xml&quot;: &quot;<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":"
diff --git a/platform-logic/restapi-templates/src/main/json/performace-data-collector.json b/platform-logic/restapi-templates/src/main/json/performace-data-collector.json
new file mode 100644
index 00000000..52cb813c
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/performace-data-collector.json
@@ -0,0 +1,16 @@
+{
+    "ietf-service-pm:performance-monitoring": {
+        "service-pm": [
+            {
+                "service-name": ${collect-performance-data-input.collect-performance-data.service-name},
+                "task-pm-enable": "true",
+                "granularity": "granularity-1min",
+                "performance-data-config": [
+                    {
+                    "parameter-name": "ietf-eth-tran-types:ingress-bandwidth",
+                    "measure-method": "measure-at-ingress"
+                    }
+            }
+        ]
+    }
+}
\ No newline at end of file