Commit 0e6b06d6 authored by Frank Bryden's avatar Frank Bryden
Browse files

Replayed some changes in reverse

parent aac818c2
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
*** 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
+2 −3
Original line number Diff line number Diff line
*** 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
+7 −7
Original line number Diff line number Diff line
*** 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 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_uri}    http://172.21.248.145
${callback_endpoint}    /nsd/subscriptions
${callback_endpoint_error}    /subs_404
${callback_endpoint_fwd}    /endpoint/check
+0 −16
Original line number Diff line number Diff line
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: []
−391 B

File deleted.

Loading