WARNING! Gitlab maintenance operation scheduled for Monday, 20 April between 12:00 and 14:00 (CET). During this time window, short service interruptions (less than 5 minutes) may occur. Thank you in advance for your understanding.

Commit 33b77cd7 authored Jul 06, 2020 by Frank Bryden Committed by Frank Bryden Jul 24, 2020

New JS files. Merge with remote changes.

parent ea60d8f7

SOL005/NSDManagement-API/environment/nsDescriptors.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	* Variables *		* Variables *
	${POS_FIELDS} name=nsdOnboardingState		${POS_FIELDS} name=nsdOnboardingState
	${NEG_FIELDS} wrongName=any_value		${NEG_FIELDS} wrongName=any_value
	${nsdInfoId} 030b1c34-116a-4cfe-9226-19732c3a7b28		${nsdInfoId} 7abbe544-6a51-4c86-af55-3a345f80e7cc
	${nsdInfoIdPlain} 20734bbb-abf6-4cd8-a35d-f416f95dc180		${nsdInfoIdPlain} 20734bbb-abf6-4cd8-a35d-f416f95dc180
	${nsdInfoIdZip} 5548bf85-8580-4c52-90d1-13c1a7a1dcb0		${nsdInfoIdZip} 352fac1d-ddce-454b-b072-184cf5ed94f5
	${nsdDownloadableZip} f3ce866a-a935-49db-9f39-8b14b662cedc		${nsdDownloadableZip} f3ce866a-a935-49db-9f39-8b14b662cedc
	${erroneous_nsdInfoId} erroneous_nsdInfoId		${erroneous_nsdInfoId} erroneous_nsdInfoId
	${disabledNsdInfoId} 5a569e1d-4ffe-4e9a-8cf6-c24226651e56		${disabledNsdInfoId} 5a569e1d-4ffe-4e9a-8cf6-c24226651e56

SOL005/NSDManagement-API/environment/variables.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@ ${NFVO_HOST} 172.21.248.145 # Hostname of the NFVO
	${NFVO_PORT} 9999 # Listening port of the NFVO		${NFVO_PORT} 9999 # Listening port of the NFVO
	${NFVO_SCHEMA} https		${NFVO_SCHEMA} https
	#auth token for OSM Access		#auth token for OSM Access
	${AUTHORIZATION} Bearer FJMG15bVJeJb4Y1t1fSKXFaCFUh0e8LD		${AUTHORIZATION} Bearer YguA4klaSzOxwE65MJ7aAWZvkOj2gAup
	${CONTENT_TYPE_JSON} application/json		${CONTENT_TYPE_JSON} application/json
	${ACCEPT_JSON} application/json		${ACCEPT_JSON} application/json
	${apiRoot} /osm/		${apiRoot} /osm/

SOL005/NSFaultManagement-API/Subscriptions.robot

+4 −0

Original line number	Original line	Diff line number	Diff line
	* Settings *		* Settings *
	Resource environment/variables.txt		Resource environment/variables.txt
	Resource NSFMOperationKeywords.robot		Resource NSFMOperationKeywords.robot
			<<<<<<< Updated upstream
	Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false		Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
			=======
			Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
			>>>>>>> Stashed changes
	Library OperatingSystem		Library OperatingSystem
	Library DependencyLibrary		Library DependencyLibrary
	Library JSONLibrary		Library JSONLibrary

SOL005/NSFaultManagement-API/environment/variables.txt

+4 −4

Original line number	Original line	Diff line number	Diff line
	* Variables *		* Variables *
	${NFVO_HOST} localhost # Hostname of the VNFM		${NFVO_HOST} 172.21.248.145 # Hostname of the VNFM
	${NFVO_PORT} 8080 # Listening port of the VNFM		${NFVO_PORT} 9999 # Listening port of the VNFM
	${NFVO_SCHEMA} https		${NFVO_SCHEMA} https
	${AUTHORIZATION} Bearer QWxhZGRpbjpvcGVuIHNlc2FtZQ==		${AUTHORIZATION} Bearer 3mT1BuYgMFj3UDqGGtj4ZTfKH74LUCLU
	${ACCEPT} application/json		${ACCEPT} application/json
	${ACCEPT_JSON} application/json		${ACCEPT_JSON} application/json
	${AUTH_USAGE} 1		${AUTH_USAGE} 1
	${alarm_filter} nsInstanceId		${alarm_filter} nsInstanceId
	${nsInstanceId} 007c111c-38a1-42c0-a666-7475ecb1567c		${nsInstanceId} 007c111c-38a1-42c0-a666-7475ecb1567c
	${invalid_alarm_filter} badFilter		${invalid_alarm_filter} badFilter
	${apiRoot} /		${apiRoot} /osm
	${apiName} nsfm		${apiName} nsfm
	${apiVersion} v1		${apiVersion} v1
	${CONTENT_TYPE} application/json		${CONTENT_TYPE} application/json

SOL005/NSLifecycleManagement-API/NSInstances.robot

+4 −0

Original line number	Original line	Diff line number	Diff line
	* Settings *		* Settings *
	Resource environment/variables.txt		Resource environment/variables.txt
	Resource NSLCMOperationKeywords.robot		Resource NSLCMOperationKeywords.robot
			<<<<<<< Updated upstream
	Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false		Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
			=======
			Library REST ${NFVO_SCHEMA}://${NFVO_HOST}:${NFVO_PORT} ssl_verify=false
			>>>>>>> Stashed changes
	Library OperatingSystem		Library OperatingSystem
	Library JSONLibrary		Library JSONLibrary
	Library JSONSchemaLibrary schemas/		Library JSONSchemaLibrary schemas/