diff options
| author |   Mariusz Wagner <mariusz.wagner@nokia.com> | 2019-03-13 11:13:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-03-13 11:13:06 +0000 |
| commit | 6e0db7ba355bf89a8bdeb00bd1087b73e16f557c (patch) | |
| tree | 406b0d3d48bf1fdc339ec38f29c3e12dc92153b6 | |
| parent | 0d1137c08dc134f79de65ca91c11869a442d88f1 (diff) | |
| parent | e3e7977dbf5600a61a2dffed961142d0adce5532 (diff) | |
Merge "Update pnfsimulator config"
| -rw-r--r-- | test/mocks/pnfsimulator/config/config.json | 53 | ||||
| -rw-r--r-- | test/mocks/pnfsimulator/json_schema/input_validator.json | 9 |
2 files changed, 33 insertions, 29 deletions
diff --git a/test/mocks/pnfsimulator/config/config.json b/test/mocks/pnfsimulator/config/config.json index 3cda0c6fc..a536c37db 100644 --- a/test/mocks/pnfsimulator/config/config.json +++ b/test/mocks/pnfsimulator/config/config.json @@ -15,31 +15,38 @@ "pnfRegistrationParams": { "serialNumber": "6061ZW3", "vendorName": "Nokia", - "oamV4IpAddress": "val3", - "oamV6IpAddress": "val4", "unitFamily": "BBU", "modelNumber": "val6", "softwareVersion": "val7", - "unitType": "val8" - }, - "notificationParams": { - "changeIdentifier": "PM_MEAS_FILES", - "changeType": "FileReady", - "arrayOfNamedHashMap": [ - {"name": "A20161221.1031-1041.bin.gz", "hashMap": { - "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz", - "compression": "gzip", - "fileFormatType": "org.3GPP.32.435#measCollec", - "fileFormatVersion": "V10" - } - }, - {"name": "A20161222.1042-1102.bin.gz", "hashMap": { - "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz", - "compression": "gzip", - "fileFormatType": "org.3GPP.32.435#measCollec", - "fileFormatVersion": "V10" - } - } - ] + "unitType": "val8", + "additionalFields": { + "attachmentPoint": "bla-bla-30-3", + "svlan": "1005", + "cvlan": "678" + }, + "notificationParams": { + "changeIdentifier": "PM_MEAS_FILES", + "changeType": "FileReady", + "arrayOfNamedHashMap": [ + { + "name": "A20161221.1031-1041.bin.gz", + "hashMap": { + "location": "ftpes://192.169.0.1:22/ftp/rop/A20161224.1030-1045.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V10" + } + }, + { + "name": "A20161222.1042-1102.bin.gz", + "hashMap": { + "location": "ftpes://192.168.0.102:22/ftp/rop/A20161224.1045-1100.bin.gz", + "compression": "gzip", + "fileFormatType": "org.3GPP.32.435#measCollec", + "fileFormatVersion": "V10" + } + } + ] + } } } diff --git a/test/mocks/pnfsimulator/json_schema/input_validator.json b/test/mocks/pnfsimulator/json_schema/input_validator.json index 13ce589ab..ced70c746 100644 --- a/test/mocks/pnfsimulator/json_schema/input_validator.json +++ b/test/mocks/pnfsimulator/json_schema/input_validator.json @@ -61,12 +61,6 @@ "vendorName": { "type": "string" }, - "oamV4IpAddress": { - "type": "string" - }, - "oamV6IpAddress": { - "type": "string" - }, "unitFamily": { "type": "string" }, @@ -78,6 +72,9 @@ }, "unitType": { "type": "string" + }, + "additionalFields": { + "type": "object" } } }, |