diff options
Diffstat (limited to 'aai-traversal/bundleconfig-local')
| -rw-r--r-- | aai-traversal/bundleconfig-local/etc/query/stored-queries.properties | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties b/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties index 8f8d39b..1fb25a1 100644 --- a/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties +++ b/aai-traversal/bundleconfig-local/etc/query/stored-queries.properties @@ -87,7 +87,7 @@ 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() - + pservers-fromVnf=union(\ __.out('runsOnPserver').store('x'),\ __.out('runsOnVserver').out('runsOnPserver').store('x')\ @@ -99,16 +99,6 @@ cloudRegion-fromNfType=out('runsOnVserver').in('owns').has('aai-node-type', 'ten 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'),\ @@ -165,18 +155,23 @@ vnf-topology-fromVfModule=in('has').has('aai-node-type', 'generic-vnf').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() - + +cloudRegion-fromCountry=in('locatedIn').has('aai-node-type','cloud-region')\ + .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() +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() 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)\ + __.in('runsOnVserver').has('aai-node-type','generic-vnf').has('nf-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('runsOnVserver').has('aai-node-type','generic-vnf').has('nf-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 |