"nsInstanceId": id_schema,
"netsliceInstanceId": id_schema,
"nsName": name_schema,
- "nsDescription": {"oneOf": [description_schema, {"type": "null"}]},
+ "nsDescription": {"oneOf": [description_schema, null_schema]},
"nsdId": id_schema,
"vimAccountId": id_schema,
+ "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
"additionalParamsForNs": object_schema,
"additionalParamsForVnf": additional_params_for_vnf,
"ssh_keys": {"type": "array", "items": {"type": "string"}},
"name": string_schema,
"vim-network-name": {"OneOf": [string_schema, object_schema]},
"vim-network-id": {"OneOf": [string_schema, object_schema]},
+ "wimAccountId": {"OneOf": [id_schema, bool_schema, null_schema]},
"ip-profile": object_schema,
"vnfd-connection-point-ref": {
"type": "array",
}
# NETSLICE SCHEMAS
-nsi_slice_instantiate = deepcopy(ns_instantiate)
-nsi_slice_instantiate["title"] = "netslice subnet instantiation params input schema"
-nsi_slice_instantiate["properties"]["id"] = name_schema
-nsi_slice_instantiate["properties"]["additionalParamsForNsi"] = object_schema
-nsi_slice_instantiate["properties"]["additionalParamsForSubnet"] = {
- "type": "array",
- "items": {
- "type": "object",
- "properties": {
- "id": name_schema,
- "additionalParamsForNs": object_schema,
- "additionalParamsForVnf": additional_params_for_vnf
- },
- "required": ["id"],
- "additionalProperties": False
- }
-}
-del nsi_slice_instantiate["required"]
-del nsi_slice_instantiate["properties"]["additionalParamsForNs"]
-del nsi_slice_instantiate["properties"]["additionalParamsForVnf"]
+nsi_subnet_instantiate = deepcopy(ns_instantiate)
+nsi_subnet_instantiate["title"] = "netslice subnet instantiation params input schema"
+nsi_subnet_instantiate["properties"]["id"] = name_schema
+del nsi_subnet_instantiate["required"]
nsi_vld_instantiate = {
"title": "netslice vld instantiation params input schema",
"lcmOperationType": string_schema,
"nsiInstanceId": id_schema,
"nsiName": name_schema,
- "nsiDescription": {"oneOf": [description_schema, {"type": "null"}]},
+ "nsiDescription": {"oneOf": [description_schema, null_schema]},
"nstId": string_schema,
"vimAccountId": id_schema,
"ssh_keys": {"type": "string"},
"nsi_id": id_schema,
+ "additionalParamsForNsi": object_schema,
"netslice-subnet": {
"type": "array",
"minItems": 1,
- "items": nsi_slice_instantiate
+ "items": nsi_subnet_instantiate
},
"netslice-vld": {
"type": "array",