New DGs added for CCVPN scenario enhancement.
Issue-ID: CCSDK-3389
Signed-off-by: zychen <418624178@qq.com>
Change-Id: I01ca7d4cfdeb5476c664fe2eb784015f1e55eaac
Former-commit-id: 32d0fbff0bfb130b605fa35fdc2465995f6c2ce0
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
new file mode 100644
index 0000000..9b89daa
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_performance-data-collector.json
@@ -0,0 +1,237 @@
+[
+ {
+ "id": "4f234968.3d6c98",
+ "type": "dgstart",
+ "name": "DGSTART",
+ "outputs": 1,
+ "x": 138,
+ "y": 639,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "a50d63cb.b2437"
+ ]
+ ]
+ },
+ {
+ "id": "a50d63cb.b2437",
+ "type": "service-logic",
+ "name": "GENERIC-RESOURCE-API ${project.version}",
+ "module": "GENERIC-RESOURCE-API",
+ "version": "${project.version}",
+ "comments": "",
+ "xml": "<service-logic xmlns="http://www.onap.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemalocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">",
+ "outputs": 1,
+ "x": 390.5713806152344,
+ "y": 638.4285583496094,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "85c5f8e0.518898"
+ ]
+ ]
+ },
+ {
+ "id": "85c5f8e0.518898",
+ "type": "method",
+ "name": "performance-data-collector",
+ "xml": "<method rpc="performance-data-collector" mode="sync">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 260.80955505371094,
+ "y": 700.333327293396,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "5f3c34cf.83512c"
+ ]
+ ]
+ },
+ {
+ "id": "5f3c34cf.83512c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic="true">",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 241.93649291992188,
+ "y": 766.206392288208,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "b3f6bb1.f68ea48",
+ "57ac747a.c5062c"
+ ]
+ ]
+ },
+ {
+ "id": "b3f6bb1.f68ea48",
+ "type": "set",
+ "name": "set pathname for context logging",
+ "xml": "<set>\n<parameter name="pathname" \n\tvalue="\"`'/var/tmp/ss-gen-name-'" +="" \n\t$ss.capability-type="" '-'="" $ss.capability-action="" \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id="" '.log'`\"="">\n",
+ "comments": "",
+ "x": 549.2500152587891,
+ "y": 766.500002861023,
+ "z": "f85a283.735a0d8",
+ "wires": []
+ },
+ {
+ "id": "92822c71.222f5",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status="success">\n<parameter name="error-message" value="`$error-message`">",
+ "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="\"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": "<outcome value="not-found">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1052.3556938171387,
+ "y": 1076.259705543518,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "39da9096.948f2"
+ ]
+ ]
+ },
+ {
+ "id": "dbad8b12.6a55c8",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value="failure">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1043.3557434082031,
+ "y": 1044.7597312927246,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "39da9096.948f2"
+ ]
+ ]
+ },
+ {
+ "id": "a89016ec.95b9f8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value="success">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1047.1057815551758,
+ "y": 1015.116836167872,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "92822c71.222f5",
+ "4572b9a9.2b7c38"
+ ]
+ ]
+ },
+ {
+ "id": "39da9096.948f2",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status="failure">\n\t<parameter name="ack-final" value="Y">\n\t<parameter name="\"error-code\"" value="\"500\"">\n <parameter name="\"error-message\"" value="\"`'Error" calling="" '="" +="" $tmp.restapiurl`\"="">\n",
+ "comments": "",
+ "x": 1210.1058082580566,
+ "y": 1061.5098037719727,
+ "z": "f85a283.735a0d8",
+ "wires": []
+ },
+ {
+ "id": "4572b9a9.2b7c38",
+ "type": "execute",
+ "name": "execute RestApiCallNode to save data to AAI",
+ "xml": "<execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1291,
+ "y": 847,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ [
+ "9581ddd2.be137",
+ "2e02c3fe.b59cec",
+ "e088155a.99a358"
+ ]
+ ]
+ },
+ {
+ "id": "9581ddd2.be137",
+ "type": "returnSuccess",
+ "name": "return success",
+ "xml": "<return status="success">\n<parameter name="" value="">\n",
+ "comments": "",
+ "x": 1588,
+ "y": 773,
+ "z": "f85a283.735a0d8",
+ "wires": []
+ },
+ {
+ "id": "2e02c3fe.b59cec",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status="failure">\n<parameter name="error-code" value="">\n<parameter name="error-message" value="">\n",
+ "comments": "",
+ "x": 1577,
+ "y": 905,
+ "z": "f85a283.735a0d8",
+ "wires": []
+ },
+ {
+ "id": "7c72a790.675628",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin="">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 519,
+ "y": 1062,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "e088155a.99a358",
+ "type": "record",
+ "name": "record",
+ "xml": "<record plugin="">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1456,
+ "y": 705,
+ "z": "f85a283.735a0d8",
+ "wires": [
+ []
+ ]
+ }
+]</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
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 063b287..158672c 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -288,5 +288,6 @@
GENERIC-RESOURCE-API tsli-vnf-topology-operation-trans-slice-modify ${project.version} sync
GENERIC-RESOURCE-API tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof ${project.version} sync
GENERIC-RESOURCE-API tsli-vnf-topology-operation-find-maximum-used-tpn ${project.version} sync
+GENERIC-RESOURCE-API performance-data-collector ${project.version} sync
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
new file mode 100644
index 0000000..9741ba3
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_performance-data-collector.xml
@@ -0,0 +1,56 @@
+[{"id":"4f234968.3d6c98","type":"dgstart","name":"DGSTART","outputs":1,"x":138,"y":639,"z":"f85a283.735a0d8","wires":[["a50d63cb.b2437"]]},{"id":"a50d63cb.b2437","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"
+<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API'
+ version='${project.version}'>
+ ","outputs":1,"x":390.5713806152344,"y":638.4285583496094,"z":"f85a283.735a0d8","wires":[["85c5f8e0.518898"]]},{"id":"85c5f8e0.518898","type":"method","name":"performance-data-collector","xml":"
+ <method rpc='performance-data-collector' mode='sync'>
+ \n","comments":"","outputs":1,"x":260.80955505371094,"y":700.333327293396,"z":"f85a283.735a0d8","wires":[["5f3c34cf.83512c"]]},{"id":"5f3c34cf.83512c","type":"block","name":"block
+ : atomic","xml":"
+ <block atomic='true'>
+ ","atomic":"true","comments":"","outputs":1,"x":241.93649291992188,"y":766.206392288208,"z":"f85a283.735a0d8","wires":[["b3f6bb1.f68ea48","57ac747a.c5062c"]]},{"id":"b3f6bb1.f68ea48","type":"set","name":"set
+ pathname for context logging","xml":"
+ <set>\n
+ <parameter name='pathname'
+ \n\tvalue=\"`'/var/tmp/ss-gen-name-' + \n\t$ss.capability-type + '-' + $ss.capability-action + '-' +
+ \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\"
+ />\n","comments":"","x":549.2500152587891,"y":766.500002861023,"z":"f85a283.735a0d8","wires":[]},{"id":"92822c71.222f5","type":"returnSuccess","name":"return
+ success","xml":"
+ <return status='success'>\n
+ <parameter name='error-message' value='`$error-message`'/>
+ ","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=\"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":"
+ <outcome value='not-found'>
+ \n","comments":"","outputs":1,"x":1052.3556938171387,"y":1076.259705543518,"z":"f85a283.735a0d8","wires":[["39da9096.948f2"]]},{"id":"dbad8b12.6a55c8","type":"failure","name":"failure","xml":"
+ <outcome value='failure'>
+ \n","comments":"","outputs":1,"x":1043.3557434082031,"y":1044.7597312927246,"z":"f85a283.735a0d8","wires":[["39da9096.948f2"]]},{"id":"a89016ec.95b9f8","type":"success","name":"success","xml":"
+ <outcome value='success'>
+ \n","comments":"","outputs":1,"x":1047.1057815551758,"y":1015.116836167872,"z":"f85a283.735a0d8","wires":[["92822c71.222f5","4572b9a9.2b7c38"]]},{"id":"39da9096.948f2","type":"returnFailure","name":"return
+ failure","xml":"
+ <return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter
+ name=\"error-code\" value=\"500\" />\n<parameter name=\"error-message\"
+ value=\"`'Error calling ' + $tmp.restapiUrl`\"
+ />\n","comments":"","x":1210.1058082580566,"y":1061.5098037719727,"z":"f85a283.735a0d8","wires":[]},{"id":"4572b9a9.2b7c38","type":"execute","name":"execute
+ RestApiCallNode to save data to AAI","xml":"
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode'
+ method='sendRequest'>
+ \n","comments":"","outputs":1,"x":1291,"y":847,"z":"f85a283.735a0d8","wires":[["9581ddd2.be137","2e02c3fe.b59cec","e088155a.99a358"]]},{"id":"9581ddd2.be137","type":"returnSuccess","name":"return
+ success","xml":"
+ <return status='success'>\n
+ <parameter name='' value=''/>
+ \n","comments":"","x":1588,"y":773,"z":"f85a283.735a0d8","wires":[]},{"id":"2e02c3fe.b59cec","type":"returnFailure","name":"return
+ failure","xml":"
+ <return status='failure'>\n<parameter name='error-code' value=''/>\n
+ <parameter name='error-message' value=''/>
+ \n","comments":"","x":1577,"y":905,"z":"f85a283.735a0d8","wires":[]},{"id":"7c72a790.675628","type":"record","name":"record","xml":"
+ <record plugin=''>
+ \n","comments":"","outputs":1,"x":519,"y":1062,"z":"f85a283.735a0d8","wires":[[]]},{"id":"e088155a.99a358","type":"record","name":"record","xml":"
+ <record plugin=''>
+ \n","comments":"","outputs":1,"x":1456,"y":705,"z":"f85a283.735a0d8","wires":[[]]}]
\ No newline at end of file