aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/resources/jolt
diff options
context:
space:
mode:
authorromaingimbert <romain.gimbert@orange.com>2018-07-05 09:28:36 +0200
committerromaingimbert <romain.gimbert@orange.com>2018-07-05 09:28:36 +0200
commit51be94a457a972d7f4036213e022c34771c51ea9 (patch)
tree7e41cbacbe148cfeb442ffb039b586084a6ce491 /src/main/resources/jolt
parent7233b362b6b79adde656c6f7fe79eaf9c0ad4c63 (diff)
serviceSpecInputSchema
- remove call to tosca file - add new field in serviceCharacteristics - change test Change-Id: Iad840360cff2920e8995e9d6dc73ded84ca86146 Issue-ID: EXTAPI-108 Signed-off-by: romaingimbert <romain.gimbert@orange.com>
Diffstat (limited to 'src/main/resources/jolt')
-rw-r--r--src/main/resources/jolt/getServiceCatalog.json17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/main/resources/jolt/getServiceCatalog.json b/src/main/resources/jolt/getServiceCatalog.json
index f0b3787..6b260b6 100644
--- a/src/main/resources/jolt/getServiceCatalog.json
+++ b/src/main/resources/jolt/getServiceCatalog.json
@@ -8,7 +8,6 @@
"invariantUUID": "invariantUUID",
"toscaModelURL": "toscaModelURL",
"toscaResourceName": "toscaResourceName",
- "resourceInstanceName" : "modelCustomizationName",
"category ": "category",
"subcategory": "subcategory",
"distributionStatus": "distributionStatus",
@@ -37,15 +36,14 @@
"resourceUUID": "resourceSpecification[&1].id",
"resourceVersion": "resourceSpecification[&1].version",
"resourceName": "resourceSpecification[&1].name",
- "resourceInstanceName": "resourceSpecification[&1].instanceName",
+ "resourceInstanceName": ["resourceSpecification[&1].resourceInstanceName","resourceSpecification[&1].modelCustomizationName"],
"resourceInvariantUUID": "resourceSpecification[&1].resourceInvariantUUID",
- "resourceType": "resourceSpecification[&1].resourceType"
- }
-
- }
-
+ "resoucreType": "resourceSpecification[&1].resourceType"
+ }
+ },
+ "serviceSpecInputSchema" : "serviceSpecCharacteristic.serviceSpecInputSchema"
}
},
{
@@ -72,6 +70,11 @@
"@type": "ONAPresource"
}
+ },
+ "serviceSpecCharacteristic" : {
+ "valueType": "complex",
+ "@type": "serviceSpecInputSchema"
+
}
}
}