Giacomo Bernini
--- a/SOL005/NSLifecycleManagement-API/environment/variables.txt

+ 1

− 26
+++ b/SOL005/NSLifecycleManagement-API/environment/variables.txt

+ 1

− 26
 *** Variables ***
-${VNFM_HOST}      localhost    # Hostname of the VNFM
-${VNFM_PORT}      8080    # Listening port of the VNFM
 ${NFVO_HOST}      localhost    # Hostname of the NFVO
 ${NFVO_PORT}      8081    # Listening port of the NFVO
-${VNFM_SCHEMA}    https
 ${NFVO_SCHEMA}    https

 ${AUTHORIZATION_HEADER}    Authorization
 ${AUTHORIZATION_TOKEN}    Bearer 0b79bab50daca910b000d4f1a2b675d604257e42
 ${CONTENT_TYPE}    application/json
-${CONTENT_TYPE_PATCH}    application/merge-patch+json
 ${ACCEPT_JSON}         application/json
 ${ACCEPT}         application/json
 ${apiRoot}        /
 ${apiName}        nslcm
 ${apiMajorVersion}     v2
 ${AUTH_USAGE}     1
-${WRONG_AUTHORIZATION}    Bearer    XXXXXWRONGXXXXX
 ${nsInstanceId}       6fc3539c-e602-4afa-8e13-962fb5a7d81f
 ${nsdId}                58a7beb6-aa89-405e-bd90-7d276b967c03
 ${disabledNsdId}        fca7c896-a7d0-4ff8-865e-f5c8ee2fd1c3
 @@ -24,19 +19,10 @@ ${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}      	931f6a4d-6a97-43f3-a6f0-13853ef577ea
-${SINGLE_FILE_VNFD}    1    # If VNFD is PLAIN TEXT
-${ACCEPT_PLAIN}    text/plain
-${ACCEPT_ZIP}     application/zip
-${nsPkgId_processing}    007c111c-38a1-42c0-a666-7475ecb1567c
-${ARTIFACT_TYPE}    application/octet-stream
-${ARTIFACT_ID}    artifactId
-${WRONG_ACCEPT}    application/json
 ${nsLcmOpOccId}    6fc3539c-e602-4afa-8e13-962fb5a7d81d
-${CancelMode}    GRACEFUL
 ${NFVO_DUPLICATION}    0
 ${sub_filter}    id=41fdd38a-3d4c-465c-83e0-f80e014425f8
 ${sub_filter_invalid}    nfvid=41fdd38a-3d4c-465c-83e0-f80e014425f8
 @@ -50,10 +36,6 @@ ${POS_filter_nsLcmOpOcc}    id=41fdd38a-3d4c-465c-83e0-f80e014425f8
 ${NEG_filter_nsLcmOpOcc}    nfvid=41fdd38a-3d4c-465c-83e0-f80e014425f8 
   
 ${subscriptionId}    6fc3539c-e602-4afa-8e13-962fb5a7d81f
-${VnfLcmOperationOccurrenceNotification}    {}
-${VnfIdentifierCreationNotification}    {}
-${VnfIdentifierDeletionNotification}    {}
-${vnfUpdateType}    ADD_VNF
 ${vnfInstanceId}    id-of-new-vnf-instance-for-UPDATE-NS-Task
 ${instantiationLevelId}     myNextLevel

 @@ -67,7 +49,6 @@ ${callback_port}    9091
 ${callback_uri}    http://localhost
 ${callback_endpoint}    /endpoint
 ${callback_endpoint_fwd}    /endpoint/check
-${callback_endpoint_error}    /endpoint_404
 ${sleep_interval}    20s
 ${total_polling_time}   2 min
 ${polling_interval}     10 sec
 @@ -80,9 +61,6 @@ ${MOCK_SERVER_JAR}    ../../../bin/mockserver-netty-5.5.0-jar-with-dependencies.
 ${response}    {}

 ${Etag}=    an etag
-${Etag_modified}=    a modified etag
-
-${NEG_FILTER}    attribute_not_exist=some_value
 ${NEG_SELECTOR}    fields=wrong_field
 ${json}    {"notificationStatus": ""}

 @@ -114,8 +92,6 @@ ${tosca_type_NsVirtualLink}    tosca.nodes.nfv.NsVirtualLink
 ${tosca_type_NsCP}    tosca.nodes.nfv.Cp
  
 ${VDU_IDs}
-${VNF_IDs}
-${virtualLink_IDs}
 ${CP_IDs}
 ${Storage_IDs}
 ${internalCP_IDs}
 @@ -123,14 +99,13 @@ ${externalCP_IDs}
 ${InstantiationLevel_IDs}

 ${NS_VirtualLink_IDs}
-${NsCP_IDs}
+
 ${SAP_IDs}

 ${NS_DescriptorID}
 ${Designer}
 ${NS_Name}
 ${NS_Version}
-${NS_InvariantId}

 ${Descriptor_ID}
 ${Provider}