[AAI-123 Amsterdam] check-in source code:

Change-Id: Ib700f5b821f9ba77a2f64b5228112c1569f7eb8c
Signed-off-by: Lamont, William (wl2432) <wl2432@att.com>

1 files changed, 88 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