Replayed some changes in reverse

Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>

Replayed some changes in reverse
Signed-off-by: Frank Bryden <Frank.Bryden@etsi.org>
e76b8c9f · Frank Bryden · aac818c2 · e76b8c9f · e76b8c9f · e76b8c9f
Commit e76b8c9f authored Sep 07, 2020 by Frank Bryden
--- a/SOL005/NSDManagement-API/environment/nsDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/nsDescriptors.txt
 *** Variables ***
 ${POS_FIELDS}     name=nsdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${nsdInfoId}    	9e708376-4f96-4972-89c2-243760626f20
-${nsdInfoIdPlain}    01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdInfoIdZip}    	01872c48-3631-4060-afa8-ca7cbef8a4d8
-${nsdDownloadableZip}   cac6ac71-0fdf-45d1-a056-775cbb8157b5
+${nsdInfoId}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdPlain}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
+${nsdInfoIdZip}    5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${erroneous_nsdInfoId}  erroneous_nsdInfoId
 ${disabledNsdInfoId}  5a569e1d-4ffe-4e9a-8cf6-c24226651e56
 ${fields}    _links
@@ -20,7 +19,7 @@ ${NFVO_RANGE_OK}    1
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${onboardingStateNsdInfoId}    b992a851-08b1-45a8-9282-a5f7a7df04a6
-${contentZipFile}    files/nsdContent.tar.gz
+${contentZipFile}    files/nsdContent.zip
 ${contentPlainFile}    files/nsdContent.yaml
 ${creatingNsdInfoId}    71241932-994a-46e2-ad6c-1740674dda44
 ${NEG_AUTHORIZATION}    Bearer negativetoken

--- a/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
+++ b/SOL005/NSDManagement-API/environment/pnfDescriptors.txt
 *** Variables ***
 ${POS_FIELDS}     name=pnfdOnboardingState
 ${NEG_FIELDS}     wrongName=any_value
-${pnfdInfoId}     b227e618-cdb9-485b-8bfe-d4b8dee8e678 #used for testing downloads
-${pnfdInfoUpld}   dd7ff0f8-0e63-41b4-a572-568d0db30153 #used for testing uploads 
+${pnfdInfoId}    40853bda-8a8f-4f63-9130-cef439f65348
 ${erroneous_pnfdInfoId}  erroneous_pnfdInfoId
 ${enabledPnfdInfoId}  40853bda-8a8f-4f63-9130-cef439f65348
 ${NFVO_FIELDS}    1
@@ -11,6 +10,6 @@ ${ACCEPT_PLAIN}    text/plain
 ${CONTENT_TYPE_PLAIN}    text/plain
 ${erroneous_pnfdId}    erroneousPnfdId
 ${onboardingStatePnfdId}    8ed2bf1f-f6ae-4d18-b478-bfab02fd4cd2
-${contentFilePnfd}    files/nsdContent.yaml
+${contentFilePnfd}    files/pnfdContent.zip
 ${creatingPnfdId}    2e4ce0ef-3ea8-49f9-92dd-8771866015bb
 ${userDefinedDataSet}    some
\ No newline at end of file
--- a/SOL005/NSDManagement-API/environment/variables.txt
+++ b/SOL005/NSDManagement-API/environment/variables.txt
 *** Variables ***
-${NFVO_HOST}    172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}    9999    # Listening port of the NFVO
+${NFVO_HOST}    localhost    # Hostname of the NFVO
+${NFVO_PORT}    8081
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer u5JGp5D3k7m1VUlrCa39k8WX15em149q 
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
 ${apiName}        nsd
 ${FIELD_USAGE}    1
-${NFVO_AUTHENTICATION}    Bearer isDGF7TiifGUgzeNb0Fls9aatfZRy4iX #never referenced
-${NFVO_AUTH_USAGE}    1 #never refernced
+${NFVO_AUTHENTICATION}    Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9
+${NFVO_AUTH_USAGE}    1

 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /nsd/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${callback_endpoint_fwd}    /endpoint/check

--- a/SOL005/NSDManagement-API/files/nsdContent.yaml
+++ b/SOL005/NSDManagement-API/files/nsdContent.yaml
-nsd:nsd-catalog:
-  nsd:
-  - constituent-vnfd: []
-    description: myNSD descriptor
-    id: myNSDRevisitedA
-    name: myNSDRevisitedA
-    short-name: myNSD
-    vendor: OSM Composer
-    version: '1.0'
-    vld:
-    - id: ns_vl_u5el
-      mgmt-network: 'true'
-      name: ns_vl_u5el
-      type: ELAN
-      vim-network-name: PUBLIC
-      vnfd-connection-point-ref: []
--- a/SOL005/NSDManagement-API/files/nsdContent.zip
+++ b/SOL005/NSDManagement-API/files/nsdContent.zip
--- a/SOL005/NSDManagement-API/files/pnfdContent.zip
+++ b/SOL005/NSDManagement-API/files/pnfdContent.zip
--- a/SOL005/NSFaultManagement-API/environment/variables.txt
+++ b/SOL005/NSFaultManagement-API/environment/variables.txt
@@ -51,8 +51,8 @@ ${response}    {}
 ${req_mock}    {}
 ${resp_mock}    {}

-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404

--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt
 *** Variables ***
 ${VNFM_HOST}      localhost    # Hostname of the VNFM
 ${VNFM_PORT}      8080    # Listening port of the VNFM
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https

-${AUTHORIZATION}    Bearer    v1qDEucqjIZSua6t4R40sraMZafJxEKb
+${AUTHORIZATION}    Bearer    QWxhZGRpbjpvcGVuIHNlc2FtZQ==
 ${CONTENT_TYPE}    application/json
 ${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
-${apiRoot}        /osm/
+${apiRoot}        /
 ${apiName}        nslcm
 ${apiVersion}     v1
 ${AUTH_USAGE}     1
 ${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
-${nsdId}                9e708376-4f96-4972-89c2-243760626f20
-${disabledNsdId}        9e708376-4f96-4972-89c2-243760626f20
-${nsInstanceId}         bef2ab38-d117-4f29-bb07-0b02508575a9
+${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
+${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
+${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
+${nonExistentNsId}      nonExistent
 ${ConflictNsInstanceId}    007c111c-e602-4afa-8e13-962fb5a7d81d
 ${nsInstanceName}    Test-nsInstance
 ${nsInstanceDescription}    description ns
 ${nsInstanceDescription_Update}    Updated description ns
 ${nsFlavourId}      0
 ${nsDegreeHealing}      HEAL_RESTORE
-${vimAccountId}      46baa285-994b-4615-8fd1-84fff6e90832
+${vimAccountId}      	931f6a4d-6a97-43f3-a6f0-13853ef577ea
 ${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
 ${ACCEPT_PLAIN}    text/plain
 ${ACCEPT_ZIP}     application/zip
@@ -33,7 +34,7 @@ ${nsPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
 ${ARTIFACT_TYPE}    application/octet-stream
 ${ARTIFACT_ID}    artifactId
 ${WRONG_ACCEPT}    application/json
-${nsLcmOpOccId}    4f704476-6a4f-4473-be24-2868b94ac214
+${nsLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
 ${CancelMode}    GRACEFUL
 ${NFVO_DUPLICATION}    0
 ${sub_filter}    filter
@@ -61,8 +62,8 @@ ${sleep_interval}    20s
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec

-${notification_request}    []
-${notification_response}    []
+${notification_request}    {}
+${notification_response}    {}

 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

@@ -73,4 +74,4 @@ ${Etag_modified}=    a modified etag

 ${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
-${json}    {}
\ No newline at end of file
+${json}    {"notificationStatus": ""}
\ No newline at end of file
--- a/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
+++ b/SOL005/NSLifecycleManagement-API/jsons/LccnSubscriptionRequest.json
@@ -6,5 +6,5 @@
      ]
    }}
  }},
-  "callbackUri": "{callbackUri}{callbackEndpoint}"
+  "callbackUri": "{callbackUri}:{callbackPort}{callbackEndpoint}"
 }}
\ No newline at end of file
--- a/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/IndividualPmJob.txt
 *** Variables ***
-${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
+${pmJobId}        29f4ff6a-be91-4ec8-856e-fcf1e2479e4e
 ${erroneousPmJobId}    erroneousPmJobId
 ${response}=    httpresponse
 ${OrigResponse}=    httpresponse

--- a/SOL005/NSPerformanceManagement-API/environment/notifications.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/notifications.txt
 *** Variables ***
-${callback_uri}    http://localhost
-${callback_port}    9091
+${callback_uri}    http://172.21.248.145
+${callback_port}    9191
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404

--- a/SOL005/NSPerformanceManagement-API/environment/reports.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/reports.txt
 *** Variables ***
 ${pmJobId}        1f50d68b-82e8-4deb-bd40-c934d4d1ac0a
-${reportId}       0fb4c875-e07f-46ca-a9dd-13907667a568
+${reportId}       177bc531-1fd0-4701-a3bb-8f54c3722e05
 ${erroneousReportId}    erroneousReportId
 ${newReportId}    newReportId
 ${response}=    httpresponse

--- a/SOL005/NSPerformanceManagement-API/environment/variables.txt
+++ b/SOL005/NSPerformanceManagement-API/environment/variables.txt
 *** Variables ***
-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer ivwDluws6XVhdFqGznZiw8cK1wP67S9b
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
@@ -17,8 +17,8 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.

 ${testOptionalMethods}    0

-${callback_port}    9091
-${callback_uri}    http://172.22.1.7:${callback_port}
+${callback_port}    9191
+${callback_uri}    http://172.21.248.145
 ${callback_endpoint}    /nspm/subscriptions
 ${callback_endpoint_error}    /subs_404
 ${sleep_interval}    20s

--- a/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/individualVnfPackage.txt
 *** Variables ***
 ${erroneousVnfPackageId}    erroneousVnfPackageId    # Given ID for vnfPkg not present in database
-${disabledVnfPackageId}    87a2c9d3-00ea-4032-8c67-a5106d001868
-${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
-${instantiatedVnfPackageId}  0b79bab50daca910b000d4f1a2b675d604257e42
\ No newline at end of file
+${disabledVnfPackageId}    ed355ce0-6263-44d2-a4ba-bdc0f454c97d
+${vnfPackageId}  75b51c1c-c723-44ba-86b0-d67c82bc1025
+${instantiatedVnfPackageId}  	01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
--- a/SOL005/VNFPackageManagement-API/environment/variables.txt
+++ b/SOL005/VNFPackageManagement-API/environment/variables.txt
 *** Variables ***

-${NFVO_HOST}      172.21.248.145    # Hostname of the NFVO
-${NFVO_PORT}      9999    # Listening port of the NFVO
+${NFVO_HOST}      localhost    # Hostname of the NFVO
+${NFVO_PORT}      8081    # Listening port of the NFVO
 ${NFVO_SCHEMA}    https
-${AUTHORIZATION}    Bearer Vr37Kbwr4eWZUNoSpWwy49mkxVmpmPWG
+${AUTHORIZATION}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE_JSON}    application/json
 ${ACCEPT_JSON}    application/json
-${apiRoot}        /osm
+${apiRoot}        /
 ${AUTH_USAGE}     1
 ${NEG_AUTHORIZATION}    Bearer negativetoken
 ${apiVersion}     v1
@@ -14,14 +14,14 @@ ${apiName}        vnfpkgm
 ${FIELD_USAGE}    1
 ${NFVO_PLAIN}     1
 ${NFVO_FIELDS}    1
-${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
+${onboardingStateVnfPkgId}   fabe092e-5f61-48b7-8feb-aac1cb39da77   # The VNF Package is in CREATED onboardingState

 ${testOptionalMethods}    0

 ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.jar

+${callback_uri}    http://localhost
 ${callback_port}    9091
-${callback_uri}    http://localhost:${callback_port}
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
 ${callback_endpoint_error}    /endpoint_404
@@ -34,4 +34,4 @@ ${NFVO_CHECKS_NOTIF_ENDPOINT}    1
 ${response}

 ${notification_request}    []
-${notification_response}    []
+${notification_response}    {}
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageArtifacts.txt
 *** Variables ***
-${artifactPath}    artifactPath
+${artifactPath}    icons/osm.png
 ${CONTENT_TYPE_OCTET}    application/octet-stream
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${range}          bytes=0-1023
 ${erroneousRange}    bytes=10000000-1000000000    # Requesting a out of range number of bytes
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPackageOctetStreamId}    octetStreamPkgId
\ No newline at end of file
+${vnfPackageOctetStreamId}    01fbfb86-0074-46e5-aa40-ef5b05f7650d
\ No newline at end of file
--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContent.txt
@@ -3,10 +3,10 @@ ${ACCEPT_ZIP}     application/zip
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_RANGE_OK}    1    # If 1 means that Range is supported by the NFVO
 ${erroneousVnfPkgId}    erroneousPkgId
-${vnfPkgId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgId}       01fbfb86-0074-46e5-aa40-ef5b05f7650d
 ${erroneousRange}    bytes=100000-1000000    # Requesting a out of range number of bytes
 ${range}          bytes=0-1023
 ${length}          1024
-${creatingVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
-${newVnfPackageId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
+${creatingVnfPackageId}   0bd11024-090e-4c4a-ab76-0119db925803
+${newVnfPackageId}   	7f8cf59f-23d4-4f04-933e-eb33ef77246a

--- a/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfPackageContentViaUri.txt
 *** Variables ***
-${vnfPkgViaUriId}       788106a2-d692-44f3-a86d-384f0ce35e42
+${vnfPkgViaUriId}       b50f305e-69e8-488d-9531-eebcc3f848a2		
 ${creatingVnfPkgViaUriId}    d246ccdd-71aa-402f-b256-6a80ee54be3d
 ${vnfPkgUri}        http://localhost/content.zip
--- a/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
+++ b/SOL005/VNFPackageManagement-API/environment/vnfdInIndividualVnfPackage.txt
@@ -5,8 +5,8 @@ ${CONTENT_TYPE_PLAIN}    text/plain
 ${CONTENT_TYPE_ZIP}    application/zip
 ${NFVO_VNFD_PLAIN}    1
 ${NFVO_VNFD_ZIP}    0
-${vnfPkgPlainVNFD}    c26ad7fb-072b-48c4-a663-7d71646d9e98    # The VNF Pakcage contains a VNFD which is a Single Plain File
-${vnfPkgZipVNFD}    f5b220d4-6177-4ebb-a554-a43311e16075    # The VNF Package contains a VNFD composed by multiple files
+${vnfPkgPlainVNFD}    7f8cf59f-23d4-4f04-933e-eb33ef77246a    # The VNF Pakcage contains a VNFD which is a Single Plain File
+${vnfPkgZipVNFD}    b0e6425c-3e18-4d32-8b61-fb4fe34f438b    # The VNF Package contains a VNFD composed by multiple files
 ${erroneousVnfPkgId}    erroneousPkgId
 ${onboardingStateVnfPkgId}    788106a2-d692-44f3-a86d-384f0ce35e42    # The VNF Package is in CREATED onboardingState
 ${vnfPackageId}  788106a2-d692-44f3-a86d-384f0ce35e42
--- a/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
+++ b/SOL005/VNFPackageManagement-API/schemas/VnfPackageChangeNotification.schema.json
 {
-  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". � The on-boarded VNF package has been deleted.\n",
+  "description": "This type represents a VNF package management notification, which informs the receiver of a change of the status in an on-boarded VNF package. Only changes in the \"operationalState\" attribute of an on-boarded VNF package and the deletion of the VNF package will be reported. Change in the \"usageState\" and \"onboardingState\" attributes are not reported. The notification shall comply with the provisions defined in Table 9.5.2.9-1. The support of this notification is mandatory. The notification shall be triggered by the NFVO when there is a change in the status of an onboarded VNF package, as follows. The \"operationalState\" attribute of a VNF package has changed, and the \"onboardingState\" attribute of the package has the value \"ONBOARDED\". The on-boarded VNF package has been deleted.\n",
  "type": "object",
  "required": [
    "id",