aboutsummaryrefslogtreecommitdiffstats
path: root/aai-traversal/bundleconfig-local/etc
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2017-06-16 17:04:44 -0400
committerVenkata Harish K Kajur <vk250x@att.com>2017-06-16 17:19:03 -0400
commitc87550c395bcb26bc9e6b4716cd2a25ae97694eb (patch)
treee2ae64762dc4973a860aab9d8257f5f8ef2753b4 /aai-traversal/bundleconfig-local/etc
parent4d0bc004f38567750fb31f407fc495c0dee28b29 (diff)
[AAI-ONAP] Add missing named queries fix model del
Add the missing thunderbolt named queries Fix model-based delete functionality Change-Id: Ib49f7a50cefff3a402eed1bfbfc716052ba91538 Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Diffstat (limited to 'aai-traversal/bundleconfig-local/etc')
-rw-r--r--aai-traversal/bundleconfig-local/etc/appprops/error.properties2
-rw-r--r--aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json24
-rw-r--r--aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json51
-rw-r--r--aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json65
4 files changed, 93 insertions, 49 deletions
diff --git a/aai-traversal/bundleconfig-local/etc/appprops/error.properties b/aai-traversal/bundleconfig-local/etc/appprops/error.properties
index 20827e6..0599bf2 100644
--- a/aai-traversal/bundleconfig-local/etc/appprops/error.properties
+++ b/aai-traversal/bundleconfig-local/etc/appprops/error.properties
@@ -28,6 +28,8 @@ AAI_3007=5:6:INFO:3007:410:3007:This version (%1) of the API is retired, please
AAI_3008=5:6:ERROR:3008:400:3008:URI is not encoded in UTF-8
AAI_3009=5:6:ERROR:3009:400:3002:Malformed URL
AAI_3010=5:6:ERROR:3010:400:3002:Cannot write via this URL
+AAI_3011=5:6:ERROR:3011:400:3000:Unknown XML namespace used in payload
+AAI_3012=5:6:ERROR:3012:400:3012:Unrecognized A&AI function
# pol errors
AAI_3100=5:1:WARN:3100:400:3100:Unsupported operation %1
AAI_3101=5:1:WARN:3101:403:3101:Attempt by client %1 to execute API %2
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
index c9b463e..2ff66f8 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
@@ -13,8 +13,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "2a160989-b202-47dd-874b-4a0f275998f7"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
} ]
} ]
}
@@ -24,8 +24,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "abcc54bc-bb74-49dc-9043-7f7171707545"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
} ]
} ]
}
@@ -36,8 +36,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
} ]
} ]
}
@@ -46,8 +46,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
} ]
} ]
}
@@ -57,8 +57,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
} ]
} ]
}
@@ -68,8 +68,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "8ecb2c5d-7176-4317-a255-26274edfdd53"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
} ]
} ]
}
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json
index aaee8d9..035dc8c 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json
@@ -12,18 +12,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "vf-module",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "vf-module",
+ "source-node-property" : "model-version-id-local",
+ "target-node-type" : "model-ver",
+ "target-node-property" : "model-version-id",
+ "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
} ]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
} ]
} ]
}
@@ -32,18 +39,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "generic-vnf",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "generic-vnf",
+ "source-node-property" : "model-version-id-local",
+ "target-node-type" : "model-ver",
+ "target-node-property" : "model-version-id",
+ "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
} ]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
} ]
} ]
}
@@ -52,18 +66,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "service-instance",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
+ "target-node-type" : "model",
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "service-instance",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
} ]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
} ]
} ]
}
diff --git a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json
index 624a4ec..2107523 100644
--- a/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json
+++ b/aai-traversal/bundleconfig-local/etc/scriptdata/named-query-json/getVserver-1.0.json
@@ -13,8 +13,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "2a160989-b202-47dd-874b-4a0f275998f7"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
} ]
} ]
}
@@ -24,8 +24,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "abcc54bc-bb74-49dc-9043-7f7171707545"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
} ]
} ]
}
@@ -35,18 +35,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "vf-module",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "vf-module",
+ "source-node-property" : "model-version-id-local",
+ "target-node-type" : "model-ver",
+ "target-node-property" : "model-version-id",
+ "property-collect-list" : ["model-name", "model-version-id", "model-version" ]
} ]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "c00563ae-812b-4e62-8330-7c4d0f47088a"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
} ]
} ]
}
@@ -54,18 +61,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "service-instance",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
- } ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "service-instance",
+ "source-node-property" : "model-version-id-local",
+ "target-node-type" : "model-ver",
+ "target-node-property" : "model-version-id",
+ "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
+ }]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "46b92144-923a-4d20-b85a-3cbd847668a9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
} ]
} ]
}
@@ -74,18 +88,25 @@
"related-lookups" : {
"related-lookup" : [ {
"source-node-type" : "generic-vnf",
- "source-node-property" : "persona-model-id",
+ "source-node-property" : "model-invariant-id-local",
"target-node-type" : "model",
- "target-node-property" : "model-id",
- "property-collect-list" : [ "model-name-version-id", "model-type", "model-name", "model-id", "model-version" ]
+ "target-node-property" : "model-invariant-id",
+ "property-collect-list" : [ "model-invariant-id", "model-type" ]
+ },
+ {
+ "source-node-type" : "generic-vnf",
+ "source-node-property" : "model-version-id-local",
+ "target-node-type" : "model-ver",
+ "target-node-property" : "model-version-id",
+ "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
} ]
},
"relationship-list" : {
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
} ]
} ]
}
@@ -95,8 +116,8 @@
"relationship" : [ {
"related-to" : "model",
"relationship-data" : [ {
- "relationship-key" : "model.model-name-version-id",
- "relationship-value" : "8ecb2c5d-7176-4317-a255-26274edfdd53"
+ "relationship-key" : "model.model-invariant-id",
+ "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
} ]
} ]
}