diff options
| author |   prakash.e <prakash.e@huawei.com> | 2019-04-15 15:17:24 +0530 |
|---|---|---|
| committer | prakash.e <prakash.e@huawei.com> | 2019-04-15 15:17:33 +0530 |
| commit | 2aeaca1d86cc6a837b186345d69c7858fb79a8af (patch) | |
| tree | d35ec43f1044c55b8846f80c7e043d787beab3c3 /platform-logic/generic-resource-api/src | |
| parent | 847da4acbcc8a828b186d119871edfde8459539c (diff) | |
Fix Authorization Failed issue in SDWAN VPN activate
Fixed vpn-activate DG by calling sdwan-get-tenant-auth DG to fix Authorization issue
Change-Id: I0ced9b9a1630baaffdee7402e609de9c64f97ed4
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: fac6813d763bd635d66fd2e213330bc2e6501b77
Diffstat (limited to 'platform-logic/generic-resource-api/src')
2 files changed, 211 insertions, 226 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json index b51105eb..c1209fc0 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.json @@ -1,20 +1,20 @@ [
{
- "id": "5781857d.34f10c",
+ "id": "21e79fdd.0452",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 188.03125,
- "y": 43.031253814697266,
- "z": "22c1b0cd.01617",
+ "x": 172,
+ "y": 78,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "34ea5d13.adf2e2"
+ "a56bff31.7def2"
]
]
},
{
- "id": "34ea5d13.adf2e2",
+ "id": "a56bff31.7def2",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,535 +22,526 @@ "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": 267.31695556640625,
- "y": 105.26936340332031,
- "z": "22c1b0cd.01617",
+ "x": 251.28570556640625,
+ "y": 140.23810958862305,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "7a350033.439ec"
+ "debd8cb4.849ed"
]
]
},
{
- "id": "7a350033.439ec",
+ "id": "debd8cb4.849ed",
"type": "method",
"name": "method sdwan-vf-operation-vpn-activate",
"xml": "<method rpc='sdwan-vf-operation-vpn-activate' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 279.03125,
- "y": 199.61759567260742,
- "z": "22c1b0cd.01617",
+ "x": 263,
+ "y": 234.58634185791016,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "eae20948.900428"
+ "7513aa1e.16b4d4"
]
]
},
{
- "id": "eae20948.900428",
+ "id": "7513aa1e.16b4d4",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 265.6979217529297,
- "y": 384.6979675292969,
- "z": "22c1b0cd.01617",
+ "x": 249.6666717529297,
+ "y": 419.6667137145996,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "94df5008.7b42f",
- "7ed34394.611e1c",
- "23e3b0bc.99c9d",
- "3dc91e9a.3f3102",
- "f95e37c5.b5e148",
- "fc6cc049.08c93",
- "b58620d0.ff986",
- "b6f2d919.b74fa8",
- "9597930d.e038d",
- "ef79430c.f091e",
- "fc543198.c0c2e",
- "a41eacc.0c7475",
- "d46578bf.5e8e58",
- "21b0010b.c0a22e",
- "5d9f4d8a.00ca04",
- "48cf7750.d184d8",
- "4efe1671.fc4788",
- "d6a9c738.cde808"
+ "f032d4b7.491cc8",
+ "67bb10ae.0e353",
+ "c1332488.62fde8",
+ "e39bef36.4698d",
+ "774b89d9.c41338",
+ "73b6f7ab.0d36d8",
+ "5ccac719.bf4388",
+ "ab39c2ec.e041d",
+ "83763572.db11e8",
+ "5e0a24cd.c963fc",
+ "5dbdc6ec.868d28",
+ "5048db5.9599324",
+ "a8022531.9687b8",
+ "6aeee675.ba6f48",
+ "139e4c0f.50ddb4",
+ "64534896.fa8bc8",
+ "8cf38aaa.8f6988"
]
]
},
{
- "id": "94df5008.7b42f",
+ "id": "f032d4b7.491cc8",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 805.6980133056641,
- "y": 222.03141355514526,
- "z": "22c1b0cd.01617",
+ "x": 789.6667633056641,
+ "y": 257.000159740448,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "23e3b0bc.99c9d",
+ "id": "c1332488.62fde8",
"type": "execute",
"name": "execute Properties",
"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' />\n",
"comments": "",
"outputs": 1,
- "x": 637.0625152587891,
- "y": 310.06250381469727,
- "z": "22c1b0cd.01617",
+ "x": 621.0312652587891,
+ "y": 345.03125,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "7ed34394.611e1c",
+ "id": "67bb10ae.0e353",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"sdwan-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"SDWAN-Activate\"/>\n",
"comments": "",
"outputs": 1,
- "x": 601.7603912353516,
- "y": 266.0624761581421,
- "z": "22c1b0cd.01617",
+ "x": 585.7291412353516,
+ "y": 301.0312223434448,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "7f983045.d243a",
+ "id": "57e47be3.8054b4",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 924.486083984375,
- "y": 360.04166173934937,
- "z": "22c1b0cd.01617",
+ "x": 908.454833984375,
+ "y": 395.0104079246521,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "875bfb0c.99b4c8",
- "fda7ec02.f4fa3"
+ "d56b85ca.9481e8",
+ "d0693d28.80f9b"
]
]
},
{
- "id": "875bfb0c.99b4c8",
+ "id": "d56b85ca.9481e8",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1108.4861907958984,
- "y": 322.0416889190674,
- "z": "22c1b0cd.01617",
+ "x": 1092.4549407958984,
+ "y": 357.0104351043701,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "2605efbe.66ab7"
+ "2748734c.684fac"
]
]
},
{
- "id": "2605efbe.66ab7",
+ "id": "2748734c.684fac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1282.4863166809082,
- "y": 322.04169273376465,
- "z": "22c1b0cd.01617",
+ "x": 1266.4550666809082,
+ "y": 357.0104389190674,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "dadb2cf7.2ff69"
+ "6309dd22.f19b94"
]
]
},
{
- "id": "dadb2cf7.2ff69",
+ "id": "6309dd22.f19b94",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.name' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1445.4862022399902,
- "y": 321.6416873931885,
- "z": "22c1b0cd.01617",
+ "x": 1429.4549522399902,
+ "y": 356.6104335784912,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "fda7ec02.f4fa3",
+ "id": "d0693d28.80f9b",
"type": "switchNode",
"name": "switch topology",
"xml": "<switch test=\"`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'topology'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1118.9026908874512,
- "y": 369.70831775665283,
- "z": "22c1b0cd.01617",
+ "x": 1102.8714408874512,
+ "y": 404.67706394195557,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "3ae5ca3b.f74cc6"
+ "8fb95e7a.24168"
]
]
},
{
- "id": "3ae5ca3b.f74cc6",
+ "id": "8fb95e7a.24168",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1292.902816772461,
- "y": 369.7083215713501,
- "z": "22c1b0cd.01617",
+ "x": 1276.871566772461,
+ "y": 404.67706775665283,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "4b92911a.56168"
+ "f7379751.d87ff8"
]
]
},
{
- "id": "4b92911a.56168",
+ "id": "f7379751.d87ff8",
"type": "set",
"name": "set topology",
"xml": "<set>\n<parameter name='prop.topology' value='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1455.902702331543,
- "y": 369.3083162307739,
- "z": "22c1b0cd.01617",
+ "x": 1439.871452331543,
+ "y": 404.27706241607666,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "3dc91e9a.3f3102",
+ "id": "e39bef36.4698d",
"type": "for",
"name": "for each network-input-parameters",
"xml": "<for index='idx' start='0' end='`$ctx.vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 672.6526527404785,
- "y": 369.708309173584,
- "z": "22c1b0cd.01617",
+ "x": 656.6214027404785,
+ "y": 404.6770553588867,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "7f983045.d243a"
+ "57e47be3.8054b4"
]
]
},
{
- "id": "4efe1671.fc4788",
+ "id": "139e4c0f.50ddb4",
"type": "get-resource",
"name": "get-resource esr-thirdparty-sdnc",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = 'SDWANController' AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
"comments": "",
"outputs": 1,
- "x": 669.4862022399902,
- "y": 496.04168128967285,
- "z": "22c1b0cd.01617",
+ "x": 653.4549522399902,
+ "y": 531.0104274749756,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "46f8b46c.58115c",
- "a1d7d554.010ed8",
- "21d4ff8e.d6051"
+ "3689f3fd.7221cc",
+ "d64da76b.209af8",
+ "17a9c1ef.c4208e"
]
]
},
{
- "id": "46f8b46c.58115c",
+ "id": "3689f3fd.7221cc",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 931.486083984375,
- "y": 449.04166159033775,
- "z": "22c1b0cd.01617",
+ "x": 915.454833984375,
+ "y": 484.0104077756405,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "df26ddf3.952"
+ "33d44e4e.88ac52"
]
]
},
{
- "id": "a1d7d554.010ed8",
+ "id": "d64da76b.209af8",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 934.97705078125,
- "y": 496.615697234869,
- "z": "22c1b0cd.01617",
+ "x": 918.94580078125,
+ "y": 531.5844434201717,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "c96d1e93.137b6"
+ "210fb3c2.b65bac"
]
]
},
{
- "id": "21d4ff8e.d6051",
+ "id": "17a9c1ef.c4208e",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 930.31005859375,
- "y": 537.9490102231503,
- "z": "22c1b0cd.01617",
+ "x": 914.27880859375,
+ "y": 572.917756408453,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "29af3383.039eac"
+ "7173d290.3a041c"
]
]
},
{
- "id": "c96d1e93.137b6",
+ "id": "210fb3c2.b65bac",
"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=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1111.5484619140625,
- "y": 484.9014333188534,
- "z": "22c1b0cd.01617",
+ "x": 1095.5172119140625,
+ "y": 519.8701795041561,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "29af3383.039eac",
+ "id": "7173d290.3a041c",
"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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1118.0826148986816,
- "y": 533.3882029950619,
- "z": "22c1b0cd.01617",
+ "x": 1102.0513648986816,
+ "y": 568.3569491803646,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "48cf7750.d184d8",
+ "id": "6aeee675.ba6f48",
"type": "execute",
"name": "execute RestApiCallNode Get token",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-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\"/>",
"comments": "",
"outputs": 1,
- "x": 689.4861221313477,
- "y": 615.0416851043701,
- "z": "22c1b0cd.01617",
+ "x": 673.4548721313477,
+ "y": 650.0104312896729,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "47bd8a4e.743ee4",
- "5c5772a6.eeb8ac"
+ "4fc3faa9.6dc304",
+ "f1aacba9.1de118"
]
]
},
{
- "id": "47bd8a4e.743ee4",
+ "id": "4fc3faa9.6dc304",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 933.486156463623,
- "y": 592.0416917800903,
- "z": "22c1b0cd.01617",
+ "x": 917.454906463623,
+ "y": 627.0104379653931,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "91c9ef14.b46a4"
+ "16433351.3e777d"
]
]
},
{
- "id": "5c5772a6.eeb8ac",
+ "id": "f1aacba9.1de118",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 925.736156463623,
- "y": 645.6845750808716,
- "z": "22c1b0cd.01617",
+ "x": 909.704906463623,
+ "y": 680.6533212661743,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[
- "b75502f5.e09e5"
+ "34937ca.3e30484"
]
]
},
{
- "id": "91c9ef14.b46a4",
+ "id": "16433351.3e777d",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
"comments": "",
- "x": 1083.486083984375,
- "y": 593.0416603088379,
- "z": "22c1b0cd.01617",
+ "x": 1067.454833984375,
+ "y": 628.0104064941406,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "b75502f5.e09e5",
+ "id": "34937ca.3e30484",
"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 executing get token rest api\" />\n",
"comments": "",
- "x": 1078.486156463623,
- "y": 645.4346361160278,
- "z": "22c1b0cd.01617",
+ "x": 1062.454906463623,
+ "y": 680.4033823013306,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "df26ddf3.952",
+ "id": "33d44e4e.88ac52",
"type": "set",
"name": "set controller data",
"xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
"comments": "",
- "x": 1128.9861450195312,
- "y": 437.04166159033775,
- "z": "22c1b0cd.01617",
+ "x": 1112.9548950195312,
+ "y": 472.0104077756405,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "5d9f4d8a.00ca04",
+ "id": "a8022531.9687b8",
"type": "execute",
"name": "execute RestApiCallNode Create vpn",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`\" />\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=\"vpn-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='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 695.2254638671875,
- "y": 728.721978187561,
- "z": "22c1b0cd.01617",
+ "x": 679.1942138671875,
+ "y": 763.6907243728638,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "f95e37c5.b5e148",
+ "id": "774b89d9.c41338",
"type": "set",
"name": "set prop.vpn-id and prop.vpn1Id",
"xml": "<set>\n<parameter name='prop.vpn-id' value='`$vpn-result.success[0].id`' />\n<parameter name='prop.vpn1Id' value='`$vpn-result.success[0].id`' />\n",
"comments": "",
- "x": 680.2256622314453,
- "y": 782.7221002578735,
- "z": "22c1b0cd.01617",
+ "x": 664.1944122314453,
+ "y": 817.6908464431763,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "21b0010b.c0a22e",
+ "id": "5048db5.9599324",
"type": "execute",
"name": "execute RestApiCallNode Create vpn topology",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-vpn-topology-create.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/' + $prop.vpn-id + '/topology'`\" />\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=\"vpn-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='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 728.7254638671875,
- "y": 825.7219481468201,
- "z": "22c1b0cd.01617",
+ "x": 706.6942138671875,
+ "y": 865.6906909942627,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "fc6cc049.08c93",
- "type": "set",
- "name": "set tenant-id to service-data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='tenant-id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.tenant-id`' />\n",
- "comments": "",
- "x": 670.7255401611328,
- "y": 877.4720306396484,
- "z": "22c1b0cd.01617",
- "wires": []
- },
- {
- "id": "b58620d0.ff986",
+ "id": "73b6f7ab.0d36d8",
"type": "set",
"name": "set vpn-id to service-data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />\n",
"comments": "",
- "x": 660.9754791259766,
- "y": 976.2218685150146,
- "z": "22c1b0cd.01617",
+ "x": 639.9442138671875,
+ "y": 927.1906471252441,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "b6f2d919.b74fa8",
+ "id": "5ccac719.bf4388",
"type": "returnSuccess",
"name": "return success",
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
"comments": "",
- "x": 618.0352668762207,
- "y": 1336.5354351997375,
- "z": "22c1b0cd.01617",
+ "x": 604.004020690918,
+ "y": 1257.504249572754,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "d6a9c738.cde808",
+ "id": "64534896.fa8bc8",
"type": "update",
"name": "update SDWAN VPN status to AAI",
"xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn' \n key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >\n<parameter name='sdwan-vpn-id' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name='operational-status' value='Active' />\n<parameter name='tenanat-id' value='`$prop.tenant-id`' />\n<parameter name='vpn-id' value='`$prop.vpn-id`' />",
"comments": "",
"outputs": 1,
- "x": 687.3649978637695,
- "y": 1230.905207157135,
- "z": "22c1b0cd.01617",
+ "x": 666.3337326049805,
+ "y": 1181.8739857673645,
+ "z": "1c1dd38f.89b8bc",
"wires": [
[]
]
},
{
- "id": "fc543198.c0c2e",
+ "id": "5e0a24cd.c963fc",
"type": "set",
"name": "set vf-module-level-oper-status",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />",
"comments": "",
- "x": 684.0000152587891,
- "y": 1174.0000378815457,
- "z": "22c1b0cd.01617",
+ "x": 662.96875,
+ "y": 1124.9688164917752,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "ef79430c.f091e",
+ "id": "83763572.db11e8",
"type": "set",
"name": "set vf-module-id and vf-module-object-path",
"xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",
"comments": "",
- "x": 718.0000152587891,
- "y": 1125.5000369278714,
- "z": "22c1b0cd.01617",
+ "x": 696.96875,
+ "y": 1076.468815538101,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "9597930d.e038d",
+ "id": "ab39c2ec.e041d",
"type": "set",
"name": "copy input data in service-data",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />\n",
"comments": "",
- "x": 681.9999694824219,
- "y": 1077.7499914169312,
- "z": "22c1b0cd.01617",
+ "x": 660.9687042236328,
+ "y": 1028.7187700271606,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "a41eacc.0c7475",
+ "id": "5dbdc6ec.868d28",
"type": "set",
"name": "set param-length + 1",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />",
+ "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />",
"comments": "",
- "x": 657.0000476837158,
- "y": 1026.0000734329224,
- "z": "22c1b0cd.01617",
+ "x": 635.9687824249268,
+ "y": 976.9688520431519,
+ "z": "1c1dd38f.89b8bc",
"wires": []
},
{
- "id": "d46578bf.5e8e58",
- "type": "set",
- "name": "set param length + 1",
- "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />\n",
+ "id": "8cf38aaa.8f6988",
+ "type": "call",
+ "name": "call sdwan-get-tenant-auth",
+ "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' >\n",
"comments": "",
- "x": 652.0000152587891,
- "y": 922.0000267028809,
- "z": "22c1b0cd.01617",
- "wires": []
+ "outputs": 1,
+ "x": 655.00390625,
+ "y": 707.00390625,
+ "z": "1c1dd38f.89b8bc",
+ "wires": [
+ []
+ ]
}
]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml index 8e93f1a5..40477c38 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-activate.xml @@ -82,6 +82,7 @@ </return>
</outcome>
</execute>
+ <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-tenant-auth' mode='sync' ></call>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sdwan-vpn-create.json'`" />
<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/overlay-network/vpn'`" />
@@ -115,24 +116,17 @@ <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
</execute>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='tenant-id' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.tenant-id`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />
</set>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />
</set>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].name' value='vpn-id' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length].value' value='`$prop.vpn-id`' />
- </set>
- <set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-request-input.vf-module-input-parameters.param_length + 1`' />
- </set>
- <set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.sdnc-request-header.' value='`$vf-module-topology-operation-input.sdnc-request-header.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.request-information.' value='`$vf-module-topology-operation-input.request-information.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.service-information.' value='`$vf-module-topology-operation-input.service-information.`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-information.' value='`$vf-module-topology-operation-input.vf-module-information.`' />
</set>
<set>
<parameter name='vf-module-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
@@ -154,9 +148,9 @@ + '/service-data/service-topology/'`"/>
</set>
<set>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status' value='Active' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-rpc-action' value='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.last-action' value='`$vf-module-topology-operation-input.sdnc-request-header.request-action`' />
</set>
<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='sdwan-vpn'
key='sdwan-vpn.sdwan-vpn-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id' >
|