summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLamont, William (wl2432) <wl2432@att.com>2017-08-02 14:02:28 -0400
committerLamont, William (wl2432) <wl2432@att.com>2017-08-02 19:20:35 -0400
commitb4a26402b07797c3f1aa82b2b038e5ff0820aec6 (patch)
treed7451e96b251e3d327a04265a59f5b837a327f8b
parentf9e3090cdad73757ea36c5fe4e7ae7572da712e3 (diff)
[AAI-123 Amsterdam] check-in source code:
Change-Id: Ib700f5b821f9ba77a2f64b5228112c1569f7eb8c Signed-off-by: Lamont, William (wl2432) <wl2432@att.com>
-rw-r--r--aai-traversal/bundleconfig-local/etc/query/stored-queries.properties95
-rw-r--r--aai-traversal/src/test/java/org/openecomp/aai/rest/search/VnfInstancesFromServiceInstancebyModelVersionTest.java85
2 files changed, 173 insertions, 7 deletions
diff --git a/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties b/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties
index f62bf9b..8f8d39b 100644
--- a/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties
+++ b/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties
@@ -87,15 +87,96 @@ colocated-devices=store('x').union(\
__.in('locatedIn').has('aai-node-type', 'pnf').store('x')\
.out('hasPinterface').store('x').out('usesPhysicalLink').store('x')\
)).cap('x').unfold().dedup()
-
-cloudRegion-fromNfType=union(\
- __.out('runsOnPserver').out('locatedIn').has('aai-node-type','cloud-region').store('x'),\
- __.out('runsOnVserver').out('runsOnPserver').out('locatedIn').has('aai-node-type','cloud-region').store('x')\
- ).cap('x').unfold().dedup()
-
pservers-fromVnf=union(\
__.out('runsOnPserver').store('x'),\
__.out('runsOnVserver').out('runsOnPserver').store('x')\
).cap('x').unfold().dedup()
- \ No newline at end of file
+
+cloudRegion-fromNfType=out('runsOnVserver').in('owns').has('aai-node-type', 'tenant').in('has').has('aai-node-type','cloud-region')\
+ .store('x').cap('x').unfold().dedup()
+
+nfType-fromCloudRegion=out('has').has('aai-node-type','tenant').out('owns').has('aai-node-type','vserver').in('runsOnVserver').has('aai-node-type','generic-vnf')\
+ .store('x').cap('x').unfold().dedup()
+
+cloudRegion-fromCountry=in('locatedIn').has('aai-node-type','cloud-region')\
+ .store('x').cap('x').unfold().dedup()
+
+locationNetTypeNetRole-fromCloudRegion=store('x').out('locatedIn').has('aai-node-type','complex').store('x')\
+ .out('usesL3Network').has('aai-node-type','l3-network')\
+ .store('x').cap('x').unfold().dedup()
+
+cloudRegion-fromCountryCloudRegionVersion=in('locatedIn').has('aai-node-type','cloud-region').has('cloud-region-version', cloudRegionVersion)\
+ .store('x').cap('x').unfold().dedup()
+
+vnf-topology-fromServiceInstance=store('x').union(\
+ __.in('hasInstance').has('aai-node-type', 'service-subscription').in('subscribesTo').has('aai-node-type','customer').store('x'),\
+ __.out('has').has('aai-node-type','allotted-resource').store('x'),\
+ __.in('hasInstance').has('aai-node-type', 'generic-vnf').store('x').union(\
+ __.out('has').has('aai-node-type','vf-module').store('x'),\
+ __.out('uses').has('aai-node-type','volume-group').store('x'),\
+ __.out('hasLInterface').has ('aai-node-type','l-interface').union(\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ ),\
+ __.out('runsOnVserver').has('aai-node-type','vserver').store('x').union(\
+ __.in('owns').has('aai-node-type','tenant').store('x').in('has').has('aai-node-type','cloud-region').store('x'),\
+ __.out('runsOnPserver').has('aai-node-type','pserver').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ )\
+ )\
+ ).cap('x').unfold().dedup()
+
+vnf-topology-fromVnf=store('x').union(\
+ __.out('hasInstance').has('aai-node-type', 'service-instance').store('x').union(\
+ __.in('hasInstance').has('aai-node-type', 'service-subscription').in('subscribesTo').has('aai-node-type','customer').store('x'),\
+ __.out('has').has('aai-node-type','allotted-resource').store('x')\
+ ),\
+ __.out('has').has('aai-node-type','vf-module').store('x'),\
+ __.out('uses').has('aai-node-type','volume-group').store('x'),\
+ __.out('hasLInterface').has ('aai-node-type','l-interface').union(\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ ),\
+ __.out('runsOnVserver').has('aai-node-type','vserver').store('x').union(\
+ __.in('owns').has('aai-node-type','tenant').store('x').in('has').has('aai-node-type','cloud-region').store('x'),\
+ __.out('runsOnPserver').has('aai-node-type','pserver').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ )\
+ ).cap('x').unfold().dedup()
+
+vnf-topology-fromVfModule=in('has').has('aai-node-type', 'generic-vnf').store('x').union(\
+ __.out('hasInstance').has('aai-node-type', 'service-instance').store('x').union(\
+ __.in('hasInstance').has('aai-node-type', 'service-subscription').in('subscribesTo').has('aai-node-type','customer').store('x'),\
+ __.out('has').has('aai-node-type','allotted-resource').store('x')\
+ ),\
+ __.out('has').has('aai-node-type','vf-module').store('x'),\
+ __.out('uses').has('aai-node-type','volume-group').store('x'),\
+ __.out('hasLInterface').has ('aai-node-type','l-interface').union(\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ ),\
+ __.out('runsOnVserver').has('aai-node-type','vserver').store('x').union(\
+ __.in('owns').has('aai-node-type','tenant').store('x').in('has').has('aai-node-type','cloud-region').store('x'),\
+ __.out('runsOnPserver').has('aai-node-type','pserver').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv4-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x'),\
+ __.out('hasLInterface').has('aai-node-type','l-interface').out('hasIpAddress').has('aai-node-type','l3-interface-ipv6-address-list').store('x').out('isMemberOf').has('aai-node-type','l3-network').store('x')\
+ )\
+ ).cap('x').unfold().dedup()
+
+images-fromCloudRegionNfType=out('has').has('aai-node-type','tenant')\
+ .out('owns').has('aai-node-type','vserver').where(\
+ __.in('runsOnVserver').has('aai-node-type','generic-vnf').has('vnf-type',nfType)\
+ ).out('hasImage').has('aai-node-type','image').store('x').cap('x').unfold().dedup()
+
+cloudRegion-fromNfTypeVendorVersion=in('hasImage').has('aai-node-type','vserver').where(\
+ __.in('runsOnVserver').has('aai-node-type','generic-vnf').has('vnf-type',nfType)\
+ ).in('owns').has('aai-node-type','tenant').in('has').has('aai-node-type','cloud-region')\
+ .store('x').cap('x').unfold().dedup()
+
+vnf-instances-fromServiceInstancebyModelVersion=in('hasInstance').has('aai-node-type', 'generic-vnf')\
+ .has('vnf-type', vnfType).has('model-version-id-local', modelVersionId)\
+ .store('x').cap('x').unfold().dedup()
+>>>>>>> feature/AAI-9099
diff --git a/aai-traversal/src/test/java/org/openecomp/aai/rest/search/VnfInstancesFromServiceInstancebyModelVersionTest.java b/aai-traversal/src/test/java/org/openecomp/aai/rest/search/VnfInstancesFromServiceInstancebyModelVersionTest.java
new file mode 100644
index 0000000..ae683f4
--- /dev/null
+++ b/aai-traversal/src/test/java/org/openecomp/aai/rest/search/VnfInstancesFromServiceInstancebyModelVersionTest.java
@@ -0,0 +1,85 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.aai.rest.search;
+
+import java.util.Map;
+
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.T;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Test;
+
+import org.openecomp.aai.exceptions.AAIException;
+import org.openecomp.aai.serialization.db.exceptions.NoEdgeRuleFoundException;
+
+public class VnfInstancesFromServiceInstancebyModelVersionTest extends QueryTest {
+ public VnfInstancesFromServiceInstancebyModelVersionTest() throws AAIException, NoEdgeRuleFoundException {
+ super();
+ }
+
+ @Test
+ public void run() {
+ super.run();
+ }
+ @Override
+ protected void createGraph() throws AAIException, NoEdgeRuleFoundException {
+
+
+ //Set up the test graph
+ Vertex serviceinstance = graph.addVertex(T.label, "service-instance", T.id, "1", "aai-node-type", "service-instance", "service-instance-id", "service-instance-id-1", "service-instance-name", "service-instance-name-1");
+ Vertex servicesubscription = graph.addVertex(T.label, "service-subscription", T.id, "2", "aai-node-type", "service-subscription", "service-subscription-id", "service-subscription-id-1","service-subscription-name","service-subscription-name1");
+ Vertex customer = graph.addVertex(T.label, "customer", T.id, "3", "aai-node-type", "customer", "customer-id", "customer-id-1", "customer-name", "customer-name1");
+
+ Vertex model1 = graph.addVertex(T.label, "model", T.id, "4", "aai-node-type", "model", "model-invariant-id", "modinvariant-id1", "model-type", "modtype");
+ Vertex modelver1 = graph.addVertex(T.label, "model-ver", T.id, "5", "aai-node-type", "model-ver", "model-version-id", "modver-id1", "model-version-id-local", "modver-id1", "model-name", "modname1", "model-version", "v1.0");
+ Vertex vnf1 = graph.addVertex(T.label, "generic-vnf", T.id, "6", "aai-node-type", "generic-vnf", "vnf-id", "vnfid1", "vnf-name", "vnfname1", "vnf-type", "vnftype1", "model-invariant-id", "modinvariant-id1", "model-version-id", "modver-id1", "model-version-id-local", "modver-id1");
+
+// Vertex model2 = graph.addVertex(T.label, "model", T.id, "7", "aai-node-type", "model", "model-invariant-id", "modinvariant-id2", "model-type", "modtype");
+// Vertex modelver2 = graph.addVertex(T.label, "model-ver", T.id, "8", "aai-node-type", "model-ver", "model-version-id", "modver-id2", "model-name", "modname2", "model-version", "v1.0");
+ Vertex vnf2 = graph.addVertex(T.label, "generic-vnf", T.id, "9", "aai-node-type", "generic-vnf", "vnf-id", "vnfid2", "vnf-name", "vnfname2", "vnf-type", "vnftype2", "model-invariant-id", "modinvariant-id1", "model-version-id", "modver-id1", "model-version-id-local", "modver-id1");
+
+
+ GraphTraversalSource g = graph.traversal();
+ rules.addTreeEdge(g, model1, modelver1);//true
+ rules.addEdge(g, vnf1, serviceinstance);//true
+ rules.addEdge(g, vnf2, serviceinstance);//false
+ rules.addTreeEdge(g, serviceinstance, servicesubscription);//true
+ rules.addTreeEdge(g, servicesubscription, customer);//true
+
+ expectedResult.add(vnf1);
+
+ }
+ @Override
+ protected String getQueryName() {
+ return "vnf-instances-fromServiceInstancebyModelVersion";
+ }
+ @Override
+ protected void addStartNode(GraphTraversal<Vertex, Vertex> g) {
+ g.has("aai-node-type", "service-instance").has("service-instance-id", "service-instance-id-1");;
+ }
+
+ @Override
+ protected void addParam(Map<String, Object> params) {
+ params.put("vnfType", "vnftype1");
+ params.put("modelVersionId", "modver-id1");
+ }
+}