diff options
author | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:27:46 -0400 |
---|---|---|
committer | Arthur Martella <amartell@research.att.com> | 2017-09-08 13:32:24 -0400 |
commit | 62cd6aaaf74aa91ee0037c0e155c8e7284f07567 (patch) | |
tree | 68c0c53c9156f5aa3c6b3599ac940770f986633d /bpmn/MSOCommonBPMN/src/test/resources | |
parent | fa1a211d28a912892fcd888569df033900eb01ee (diff) |
1710 Rebase - Second Attempt
This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400
Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000
Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/test/resources')
5 files changed, 97 insertions, 2 deletions
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policyAbortResponse.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policyAbortResponse.json new file mode 100644 index 0000000000..c315b1ed1d --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policyAbortResponse.json @@ -0,0 +1 @@ +{"decision":"PERMIT","details":"Abort"}
\ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policySkipResponse.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policySkipResponse.json new file mode 100644 index 0000000000..7cbdebb6b3 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/Policy/policySkipResponse.json @@ -0,0 +1 @@ +{"decision":"PERMIT","details":"Skip"}
\ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/pserver.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/pserver.json new file mode 100644 index 0000000000..1a3f40aac3 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/aai/pserver.json @@ -0,0 +1,14 @@ +{ + "results": [ + { + "pserver": { + "hostname": "test" + } + }, + { + "pserver": { + "hostname": "test2" + } + } + ] +}
\ No newline at end of file diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesData.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesData.json new file mode 100644 index 0000000000..a69d1b3622 --- /dev/null +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/getCatalogServiceResourcesData.json @@ -0,0 +1,57 @@ +{ + "serviceResources": { + "modelInfo": { + "modelName": "MOW AVPN vMX AV vPE Service", + "modelUuid": "b73c6911-be64-448a-bb4b-7b7a7006507a", + "modelInvariantUuid": "d48764b1-043d-4783-89e3-8816602dc833", + "modelVersion": "5.0" + }, + "serviceVnfs": [ + { + "modelInfo": { + "modelName": "MOW AVPN vMX AV vPE", + "modelUuid": "07bc0630-11d2-4c08-9c8f-75b036db1f4d", + "modelInvariantUuid": "31d077f6-356f-436e-b447-1997faff4c68", + "modelVersion": "3.0", + "modelCustomizationUuid": "16e5d513-1b96-4146-a325-af661d06eafd", + "modelInstanceName": "MOW AVPN vMX AV vPE 1" + }, + "toscaNodeType": null, + "nfFunction": null, + "nfType": null, + "nfRole": null, + "nfNamingCode": null, + "vfModules": [ + { + "modelInfo": { + "modelName": "MowAvpnVmxAvVpe..base_vRE_AV..module-0", + "modelUuid": "c91330e5-8e1a-459b-95ee-d682046cbeca", + "modelInvariantUuid": "f9f41064-cbe7-4e94-ac4c-93d9c54af317", + "modelVersion": "3", + "modelCustomizationUuid": "778c2ed5-77a8-426e-94fe-51a4d40199c3" + }, + "isBase": true, + "vfModuleLabel": "base_vRE_AV", + "initialCount": 1, + "hasVolumeGroup": true + }, + { + "modelInfo": { + "modelName": "MowAvpnVmxAvVpe..vPFE_AV..module-1", + "modelUuid": "ab5af099-03cb-4e74-92bf-44569099a666", + "modelInvariantUuid": "192faf79-7284-4a33-92d5-0be5b607ea43", + "modelVersion": "3", + "modelCustomizationUuid": "cb510af0-5b21-4bc7-86d9-323cb396ced3" + }, + "isBase": false, + "vfModuleLabel": "vPFE_AV", + "initialCount": 0, + "hasVolumeGroup": true + } + ] + } + ], + "serviceNetworks": [], + "serviceAllottedResources": [] + } +} diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties index 1ac75e9456..c764c7f04e 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties +++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties @@ -9,9 +9,12 @@ mso.csi.pwd=4EA237303511EFBBC37F17A351562131 mso.csi.usrname=mso
mso.msoKey=07a7159d3bf51a0e53be7a8f89699be7
+mso.healthcheck.log.debug=false
+
mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
+mso.openecomp.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
@@ -20,8 +23,22 @@ mso.adapters.network.rest.endpoint=http://localhost:28090/networks/NetworkAdapte mso.adapters.po.auth=757A94191D685FD2092AC1490730A4FC
mso.adapters.po.password=3141634BF7E070AA289CF2892C986C0B
mso.po.timeout=PT60S
+mso.default.adapter.namespace=http://org.openecomp.mso
+
+aai.auth=26AFB797A6A57960D5D718491925C50F77CDC22AC394B3DBA09950D8FD1C0764
-aai.auth=757A94191D685FD2092AC1490730A4FC
+policy.endpoint=https://mtanjvsgcvm02.nvp.cip.att.com:8081/pdp/api/getDecision
+policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk
+policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==
+policy.environment=TEST
+
+appc.topic.read=APPC-CL-FUSION-LCM-RESPONSE
+appc.topic.read.timeout=60000
+appc.client.response.timeout=3600000
+appc.topic.write=APPC-CL-FUSION-LCM
+appc.pool.members=uebsb91bodc.it.openecomp.org:3904,uebsb92bodc.it.openecomp.org:3904,uebsb93bodc.it.openecomp.org:3904
+appc.client.key=iaEMAfjsVsZnraBP
+appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz
mso.adapters.sdnc.endpoint=http://localhost:28090/SDNCAdapter
mso.adapters.sdnc.rest.endpoint=http://localhost:28090/SDNCAdapter/v1/sdnc
@@ -90,4 +107,9 @@ log.debug.GenericDeleteService=true log.debug.GenericDeleteNetwork=true
log.debug.GenericDeleteVnf=true
log.debug.vnfAdapterCreateV1=true
-log.debug.vnfAdapterRestV1=true +log.debug.vnfAdapterRestV1=true
+
+policyClientAuth=Basic bTAzNzQzOnBvbGljeVIwY2sk
+policyAuth=Basic dGVzdHBkcDphbHBoYTEyMw==
+policyEnvironment=TEST
+policyEndpoint=localhost:8080/pdp/api/getDecision
|