aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vfc/nfvo-lcm/jsoninput
diff options
context:
space:
mode:
Diffstat (limited to 'tests/vfc/nfvo-lcm/jsoninput')
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json7
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/create_pnf.json8
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/create_sfc.json6
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/create_subscription.json65
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json42
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json51
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json127
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json3
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/scale_ns.json18
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json59
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json2
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json4
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json5
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/update_ns.json19
-rw-r--r--tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json15
15 files changed, 44 insertions, 387 deletions
diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json
index bed82d90..38201435 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/create_ns_instance.json
@@ -1,5 +1,6 @@
{
- "nsdId": "23",
- "nsName": "ns23",
- "nsDescription": "ns23 desc"
+ "nsdId": "c9f0a95e-dea0-4698-96e5-5a79bc5a233d",
+ "nsName": "ns",
+ "nsDescription": "description",
+ "test": "test"
} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json b/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json
deleted file mode 100644
index 282e0af2..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/create_pnf.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "pnfId": "123",
- "pnfName": "pnf1",
- "pnfdId": "456",
- "pnfdInfoId": "011234",
- "pnfProfileId": "456788",
- "cpInfo": "cp info"
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json b/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json
deleted file mode 100644
index e7fe0170..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/create_sfc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "fpindex": "123",
- "nsInstanceId": "123",
- "context": "create sfc",
- "sdnControllerId": "123"
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json b/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json
index 553d38ce..a3368974 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/create_subscription.json
@@ -1,54 +1,19 @@
{
- "callbackUri": "/api/nslcm/v1/subscriptions",
- "filter": {
- "nsInstanceSubscriptionFilter": {
- "nsdIds": [
- "3fa85f64-5717-4562-b3fc-2c963f66afa6"
- ],
- "vnfdIds": [
- "3fa85f64-5717-4562-b3fc-2c963f66afa6"
- ],
- "pnfdIds": [
- "3fa85f64-5717-4562-b3fc-2c963f66afa6"
- ],
- "nsInstanceIds": [
- "3fa85f64-5717-4562-b3fc-2c963f66afa6"
- ],
- "nsInstanceNames": [
- "ns1"
- ]
+ "callbackUri": "http://aurl.com",
+ "authentication": {
+ "authType": ["BASIC"],
+ "paramsBasic": {
+ "username": "username",
+ "password": "password"
+ }
},
- "notificationTypes": [
- "NsLcmOperationOccurrenceNotification"
- ],
- "operationTypes": [
- "INSTANTIATE"
- ],
- "operationStates": [
- "STARTING"
- ],
- "nsComponentTypes": [
- "VNF"
- ],
- "lcmOpNameImpactingNsComponent": [
- "VNF_INSTANTIATE"
- ],
- "lcmOpOccStatusImpactingNsComponent": [
- "START"
- ]
- },
- "authentication": {
- "authType": [
- "BASIC"
- ],
- "paramsBasic": {
- "userName": "test",
- "password": "test"
- },
- "paramsOauth2ClientCredentials": {
- "clientId": "123",
- "clientPassword": "test",
- "tokenEndpoint": "test"
+ "filter": {
+ "notificationTypes": ["NsLcmOperationOccurrenceNotification"],
+ "operationTypes": [
+ "INSTANTIATE"
+ ],
+ "operationStates": [
+ "STARTING"
+ ]
}
- }
} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json
deleted file mode 100644
index d15d7373..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/heal_ns_instance.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "healVnfData": [
- {
- "vnfInstanceId": "vnf123",
- "cause": "string",
- "additionalParams": {
- "additionalProp1": {
- "action": "action1",
- "actionvminfo": {
- "vmid": "vm123",
- "vduid": "vdu123",
- "vmname": "vmname1"
- }
- },
- "additionalProp2": {
- "action": "action2",
- "actionvminfo": {
- "vmid": "vm456",
- "vduid": "vdu456",
- "vmname": "vmname456"
- }
- },
- "additionalProp3": {
- "action": "action3",
- "actionvminfo": {
- "vmid": "vm789",
- "vduid": "vdu789",
- "vmname": "vmname789"
- }
- }
- }
- }
- ],
- "healNsData": {
- "degreeHealing": "HEAL_RESTORE",
- "actionsHealing": [
- "action for healing"
- ],
- "healScript": "script2",
- "additionalParamsforNs": "additional info"
- }
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json b/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json
deleted file mode 100644
index 01ed3961..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "locationConstraints": [
- {
- "vnfProfileId": "123",
- "locationConstraints": {
- "vimId": "vim123"
- }
- }
- ],
- "additionalParamForNs": {
- "additionalProp1": "Prop1",
- "additionalProp2": "Prop2",
- "additionalProp3": "Prop3"
- },
- "addpnfData": [
- {
- "pnfId": "123",
- "pnfName": "pdf123",
- "pnfdId": "123",
- "pnfProfileId": "123",
- "cpData": [
- {
- "cpInstanceId": "123",
- "cpdId": "123",
- "cpProtocolData": [
- {
- "layerProtocol": "IP_OVER_ETHERNET",
- "ipOverEthernet": {
- "macAddress": "7C-76-35-4C-31-78",
- "ipAddresses": [
- {
- "type": "IPV4",
- "fixedAddresses": [
- "192.168.43.10"
- ],
- "numDynamicAddresses": 0,
- "addressRange": {
- "minAddress": "192.168.253.0",
- "maxAddress": "192.168.253.255"
- },
- "subnetId": "255.255.255.0"
- }
- ]
- }
- }
- ]
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json
deleted file mode 100644
index 75a19459..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/instantiate_ns_instance.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
- "nsFlavourId": "nsFlavour123",
- "sapData": [
- {
- "sapdId": "23",
- "sapName": "sap123",
- "description": "sap desc",
- "sapProtocolData": [
- {
- "layerProtocol": "IP_OVER_ETHERNET",
- "ipOverEthernet": {
- "macAddress": "7C-76-35-4C-31-78",
- "ipAddresses": [
- {
- "type": "IPV4",
- "fixedAddresses": [
- "192.168.43.12"
- ],
- "numDynamicAddresses": 0,
- "addressRange": {
- "minAddress": "192.168.253.0",
- "maxAddress": "192.168.253.255"
- },
- "subnetId": "255.255.255.0"
- }
- ]
- }
- }
- ]
- }
- ],
- "addpnfData": [
- {
- "pnfId": "pnf123",
- "pnfName": "pnfName123",
- "pnfdId": "pnfd123",
- "pnfProfileId": "pnfPro123",
- "cpData": [
- {
- "cpInstanceI16": {
- "IdentifierInPnf": {}
- },
- "cpdId": {
- "IdentifierInNsd": {}
- },
- "cpProtocolData": [
- {
- "layerProtocol": "IP_OVER_ETHERNET",
- "ipOverEthernet": {
- "macAddress": "7C-76-35-4C-31-78",
- "ipAddresses": [
- {
- "type": "IPV4",
- "fixedAddresses": [
- "192.168.43.15"
- ],
- "numDynamicAddresses": 0,
- "addressRange": {
- "minAddress": "192.168.43.0",
- "maxAddress": "192.168.43.255"
- },
- "subnetId": "255.255.255.0"
- }
- ]
- }
- }
- ]
- }
- ]
- }
- ],
- "vnfInstanceData": [
- {
- "vnfInstanceId": "vnf123",
- "vnfProfileId": "vnfPro123"
- }
- ],
- "nestedNsInstanceId": [
- "nested123"
- ],
- "localizationLanguage": [
- {
- "vnfProfileId": "string",
- "locationConstraints": {
- "countryCode": "460",
- "civicAddressElement": [
- {
- "caType": "type1",
- "caValue": "123"
- }
- ]
- }
- }
- ],
- "additionalParamForNs": {
- "additionalProp1": "nsProp1",
- "additionalProp2": "nsProp2",
- "additionalProp3": "nsProp3"
- },
- "additionalParamsForVnf": [
- {
- "vnfProfileId": "vnfPro456",
- "additionalParams": {
- "additionalProp1": "vnfProp1",
- "additionalProp2": "vnfProp2",
- "additionalProp3": "vnfProp3"
- }
- }
- ],
- "startTime": "2019-10-08T01:45:26.226Z",
- "nsInstantiationLevelId": "345678",
- "additionalAffinityOrAntiAffiniityRule": [
- {
- "vnfdId": [
- "123"
- ],
- "vnfProfileId": [
- "456"
- ],
- "vnfInstanceId": [
- "789"
- ],
- "affinityOrAntiAffiinty": "AFFINITY",
- "scope": "NFVI_POP"
- }
- ]
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json b/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json
deleted file mode 100644
index c518885c..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/postdeal_ns.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "status": "ongoing"
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json b/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json
index e7f729d8..de0a95e8 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/scale_ns.json
@@ -1,14 +1,12 @@
{
- "scaleType": "ns",
- "scaleNsData": [
- {
- "scaleNsByStepsData": [
+ "scaleType": "SCALE_NS",
+ "scaleNsData": [
{
- "aspectId": "123",
- "numberOfSteps": "3",
- "scalingDirection": "north"
+ "scaleNsByStepsData": [{
+ "aspectId": "1",
+ "numberOfSteps": 1,
+ "scalingDirection": "0"
+ }]
}
- ]
- }
- ]
+ ]
} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json
deleted file mode 100644
index 73d27f6e..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/scale_ns_instance.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "scaleType": "ns_instance",
- "scaleNsData": [
- {
- "vnfInstanceToBeAdded": [
- {
- "vnfInstanceId": "vnf456",
- "vnfProfileId": "vnfPro456"
- }
- ],
- "vnfInstanceToBeRemoved": [
- ""
- ],
- "scaleNsByStepsData": {
- "scalingDirection": "SCALE_IN",
- "aspectId": "123",
- "numberOfSteps": "2"
- },
- "scaleNsToLevelData": {
- "nsInstantiationLevel": "1",
- "nsScaleInfo": [
- {
- "nsScalingAspectId": "2",
- "nsScaleLevelId": "3"
- }
- ]
- },
- "additionalParamsForNs": {
- "additionalProp1": "nsProp11",
- "additionalProp2": "nsProp12",
- "additionalProp3": "nsProp13"
- },
- "additionalParamsForVnf": [
- {
- "vnfProfileId": "string",
- "additionalParams": {
- "additionalProp1": "vnfProp11",
- "additionalProp2": "vnfProp12",
- "additionalProp3": "vnfProp13"
- }
- }
- ],
- "locationConstraints": [
- {
- "vnfProfileId": "vnfPro789",
- "locationConstraints": {
- "countryCode": "460",
- "civicAddressElement": [
- {
- "caType": "type2",
- "caValue": "789"
- }
- ]
- }
- }
- ]
- }
- ]
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json
index d03830a9..0cb384b5 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/terminate_ns_instance.json
@@ -1,3 +1,3 @@
{
- "terminationTime": "1602668880"
+ "terminationTime": "2020-03-25T09:10:35.610"
} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json b/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json
index 9884b6ac..7cee8684 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/terminate_vnf.json
@@ -1,4 +1,4 @@
{
- "terminationType": "vnf",
- "gracefulTerminationTimeout": "3600"
+ "terminationType": "FORCEFUL",
+ "gracefulTerminationTimeout": "600"
} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json b/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json
deleted file mode 100644
index 3682bcfb..00000000
--- a/tests/vfc/nfvo-lcm/jsoninput/update_job_ns.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "progress": "updating",
- "desc": "update job des",
- "errcode": "405"
-} \ No newline at end of file
diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_ns.json b/tests/vfc/nfvo-lcm/jsoninput/update_ns.json
index 2722b3a5..c71329f7 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/update_ns.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/update_ns.json
@@ -1,12 +1,9 @@
{
- "updateType": "ADD_VNF",
- "addVnfInstance": [
- {
- "vnfInstanceId": "456",
- "vnfProfileId": "456"
- }
- ],
- "updateTime": {
- "DateTime": {}
- }
-} \ No newline at end of file
+ "updateType": "OPERATE_VNF",
+ "OperateVnfData": [{
+ "vnfInstanceId": "test_vnf_001",
+ "changeStateTo": {"OperationalStates": "STOPPED"},
+ "stopType": "GRACEFUL",
+ "gracefulStopTimeout": "2020-01-01"
+ }]
+}
diff --git a/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json b/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json
index 2722b3a5..417958b5 100644
--- a/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json
+++ b/tests/vfc/nfvo-lcm/jsoninput/update_ns_instance.json
@@ -1,12 +1,9 @@
{
"updateType": "ADD_VNF",
- "addVnfInstance": [
- {
- "vnfInstanceId": "456",
- "vnfProfileId": "456"
- }
- ],
- "updateTime": {
- "DateTime": {}
- }
+ "OperateVnfData": [{
+ "vnfInstanceId": "test_vnf_001",
+ "changeStateTo": {"OperationalStates": "STOPPED"},
+ "stopType": "GRACEFUL",
+ "gracefulStopTimeout": "2020-01-01"
+ }]
} \ No newline at end of file