Code Review
/
sdnc
/
oam.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Bug fixing for CCVPN IBN closed-loop operation.
[sdnc/oam.git]
/
platform-logic
/
generic-resource-api
/
src
/
main
/
json
/
cloud_leased_line
/
GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
diff --git
a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
index
3fb30cd
..
8897cd2
100644
(file)
--- a/
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
+++ b/
platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
@@
-1,190
+1,190
@@
[
\r
{
\r
[
\r
{
\r
- "id": "
4bf68406.ddcfc4
",
\r
+ "id": "
e4aeb52e.202cc8
",
\r
"type": "dgstart",
\r
"name": "DGSTART",
\r
"outputs": 1,
\r
"type": "dgstart",
\r
"name": "DGSTART",
\r
"outputs": 1,
\r
- "x": 2
52.33331298828125
,
\r
- "y": 1
02.33334350585938
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 2
04.56666564941406
,
\r
+ "y": 1
20
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[
\r
"wires": [
\r
[
\r
- "
556d56b1.8aa24
"
\r
+ "
9feb921c.82a788
"
\r
]
\r
]
\r
},
\r
{
\r
]
\r
]
\r
},
\r
{
\r
- "id": "
556d56b1.8aa24
",
\r
+ "id": "
9feb921c.82a788
",
\r
"type": "service-logic",
\r
"type": "service-logic",
\r
- "name": "GENERIC-RESOURCE-API
${project.version}
",
\r
+ "name": "GENERIC-RESOURCE-API
777
",
\r
"module": "GENERIC-RESOURCE-API",
\r
"module": "GENERIC-RESOURCE-API",
\r
- "version": "
${project.version}
",
\r
+ "version": "
777
",
\r
"comments": "",
\r
"comments": "",
\r
- "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}
'>",
\r
+ "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='
777
'>",
\r
"outputs": 1,
\r
"outputs": 1,
\r
- "x":
536.6190032958984
,
\r
- "y": 1
63.5714521408081
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x":
488.85235595703125
,
\r
+ "y": 1
81.23810863494873
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[
\r
"wires": [
\r
[
\r
- "
5ee8264.6655ed8
"
\r
+ "
6348e040.131e2
"
\r
]
\r
]
\r
},
\r
{
\r
]
\r
]
\r
},
\r
{
\r
- "id": "
5ee8264.6655ed8
",
\r
+ "id": "
6348e040.131e2
",
\r
"type": "method",
\r
"name": "method cll-vnf-topology-operation-cll-callbackdg-notification",
\r
"xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
"type": "method",
\r
"name": "method cll-vnf-topology-operation-cll-callbackdg-notification",
\r
"xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
- "x":
523.7619018554688
,
\r
- "y": 2
39.3333740234375
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x":
475.99525451660156
,
\r
+ "y": 2
57.0000305175781
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[
\r
"wires": [
\r
[
\r
- "
662af79a.da0ee8
"
\r
+ "
afa43904.62cb1
"
\r
]
\r
]
\r
},
\r
{
\r
]
\r
]
\r
},
\r
{
\r
- "id": "
662af79a.da0ee8
",
\r
+ "id": "
afa43904.62cb1
",
\r
"type": "block",
\r
"name": "block : atomic",
\r
"xml": "<block atomic=\"true\">",
\r
"atomic": "true",
\r
"outputs": 1,
\r
"type": "block",
\r
"name": "block : atomic",
\r
"xml": "<block atomic=\"true\">",
\r
"atomic": "true",
\r
"outputs": 1,
\r
- "x": 8
52.5713500976562
,
\r
- "y": 2
40.00003051757812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 8
04.8047027587891
,
\r
+ "y": 2
57.66668701171875
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[
\r
"wires": [
\r
[
\r
- "
49cf2266.9e9664
",
\r
- "
6d86a3cf.e795b4
",
\r
- "
747b5a7a.94fc0c
",
\r
- "
82c91d0d.6b833
",
\r
- "
d8e4f1a3.d839d
",
\r
- "3
2379d64.d2f70a
",
\r
- "2
e37faa.5c2ae06
",
\r
- "
83f79f41.a9ad3
"
\r
+ "
b180367c.1f9198
",
\r
+ "
7ef57ba6.1f727c
",
\r
+ "
c42a69a0.a4eb7
",
\r
+ "
5786b926.3906a8
",
\r
+ "
b1e4d5b8.551e78
",
\r
+ "3
8d39329.9d1d2c
",
\r
+ "2
5fc0d1d.85e28a
",
\r
+ "
93ceb81d.d133c
"
\r
]
\r
]
\r
},
\r
{
\r
]
\r
]
\r
},
\r
{
\r
- "id": "
49cf2266.9e9664
",
\r
+ "id": "
b180367c.1f9198
",
\r
"type": "execute",
\r
"name": "execute properties",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />",
\r
"comments": "",
\r
"outputs": 1,
\r
"type": "execute",
\r
"name": "execute properties",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />",
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 1
103.3333129882812
,
\r
- "y": 2
40.3333435058593
8,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 1
055.566665649414
,
\r
+ "y": 2
5
8,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "
6d86a3cf.e795b4
",
\r
+ "id": "
7ef57ba6.1f727c
",
\r
"type": "set",
\r
"name": "set received notification parameters",
\r
"xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
\r
"comments": "",
\r
"type": "set",
\r
"name": "set received notification parameters",
\r
"xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
\r
"comments": "",
\r
- "x": 1
131.3333740234375
,
\r
- "y": 4
13.3333435058594
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 1
083.5667266845703
,
\r
+ "y": 4
31
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": []
\r
},
\r
{
\r
"wires": []
\r
},
\r
{
\r
- "id": "
83f79f41.a9ad3
",
\r
+ "id": "
93ceb81d.d133c
",
\r
"type": "record",
\r
"name": "record",
\r
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
\r
"comments": "",
\r
"outputs": 1,
\r
"type": "record",
\r
"name": "record",
\r
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 10
67.3333740234375
,
\r
- "y":
184.33334350585938
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 10
19.5667266845703
,
\r
+ "y":
202
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "
747b5a7a.94fc0c
",
\r
+ "id": "
c42a69a0.a4eb7
",
\r
"type": "save",
\r
"name": "save:metadata to AAI",
\r
"type": "save",
\r
"name": "save:metadata to AAI",
\r
- "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t AND service-instance.service-instance-id = $rcvd-service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">-->\n
<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $rcvd-service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n
",
\r
+ "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t AND service-instance.service-instance-id = $rcvd-service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">-->\n
\n<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $rcvd-service-instance-id\" force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!-- <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />-->\n<!-- <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />-->\n\n\n<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id = $rcvd-service-instance-id\n AND customer.global-customer-id = '5GCustomer' \n AND service-subscription.service-type = '5G'\" force=\"true\" pfx=\"tmp.AnAI-data\">\n <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n\n\n \n
",
\r
"comments": "",
\r
"outputs": 1,
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 10
88.3333740234375
,
\r
- "y": 4
76.33334350585
94,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 10
40.5667266845703
,
\r
+ "y": 494,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "3
2379d64.d2f70a
",
\r
+ "id": "3
8d39329.9d1d2c
",
\r
"type": "set",
\r
"name": "set parameters",
\r
"xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
\r
"comments": "",
\r
"type": "set",
\r
"name": "set parameters",
\r
"xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
\r
"comments": "",
\r
- "x": 10
67.3333740234375
,
\r
- "y": 7
23.3333129882812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 10
19.5667266845703
,
\r
+ "y": 7
40.9999694824219
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": []
\r
},
\r
{
\r
"wires": []
\r
},
\r
{
\r
- "id": "2
e37faa.5c2ae06
",
\r
+ "id": "2
5fc0d1d.85e28a
",
\r
"type": "execute",
\r
"name": "execute RestApiCallNode call VES",
\r
"type": "execute",
\r
"name": "execute RestApiCallNode call VES",
\r
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<
parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />-->\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>
\n",
\r
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<
!--<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />-->\n<parameter name=\"restapiUrl\" value=\"https://dcae-ves-collector:8443/eventListener/v7\" />\n<parameter name=\"restapiUser\" value=\"sample1\" />\n<parameter name=\"restapiPassword\" value=\"sample1\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n<parameter name=\"disableHostVerification\" value=\"true\"/>\n<parameter name=\"ssl\" value=\"false\"/>\n
\n",
\r
"comments": "",
\r
"outputs": 1,
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 1
125.3333740234375
,
\r
- "y": 7
66.3333129882812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 1
077.5667266845703
,
\r
+ "y": 7
83.9999694824219
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "
82c91d0d.6b833
",
\r
+ "id": "
5786b926.3906a8
",
\r
"type": "execute",
\r
"name": "execute UUID generator for eventId",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
"type": "execute",
\r
"name": "execute UUID generator for eventId",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 1
129.3333740234375
,
\r
- "y": 6
31.3333129882812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 1
081.5667266845703
,
\r
+ "y": 6
48.9999694824219
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "
d8e4f1a3.d839d
",
\r
+ "id": "
b1e4d5b8.551e78
",
\r
"type": "execute",
\r
"name": "execute UUID generator for eventName",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
"type": "execute",
\r
"name": "execute UUID generator for eventName",
\r
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
\r
"comments": "",
\r
"outputs": 1,
\r
- "x": 1
142.3333740234375
,
\r
- "y": 6
73.3333129882812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 1
094.5667266845703
,
\r
+ "y": 6
90.9999694824219
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
"wires": [
\r
[]
\r
]
\r
},
\r
{
\r
- "id": "
d1081f1a.6938
",
\r
+ "id": "
2ee5d5bb.37a0e2
",
\r
"type": "comment",
\r
"name": "Calling VES and passing notification parameters",
\r
"info": "",
\r
"comments": "",
\r
"type": "comment",
\r
"name": "Calling VES and passing notification parameters",
\r
"info": "",
\r
"comments": "",
\r
- "x": 11
56.3333740234375
,
\r
- "y": 5
76.3333129882812
,
\r
- "z": "
f5fa16f3.117ab
8",
\r
+ "x": 11
08.5667266845703
,
\r
+ "y": 5
93.9999694824219
,
\r
+ "z": "
bdffb6ef.b80cc
8",
\r
"wires": []
\r
}
\r
]
\ No newline at end of file
"wires": []
\r
}
\r
]
\ No newline at end of file