Update traversal from AJSC 2 to Spring Boot

Issue-ID: AAI-799 Change-Id: I6500f661db704726f529f665203a9c0605e8193e Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
author: Venkata Harish K Kajur <vk250x@att.com> 2018-02-06 15:06:44 -0500
committer: Venkata Harish K Kajur <vk250x@att.com> 2018-03-07 10:02:36 -0500
commit: a0d3e8ee8d78d41e4a58437983bc4c894d0024df (patch)
tree: 37f4698a9481349548eec326f2845f8cb1abd06f /aai-traversal/src/main/resources/etc
parent: e688a3115c5de57ca9ac3e218fad6ecb50d6f8b1 (diff)
138 files changed, 4841 insertions, 0 deletions
diff --git a/aai-traversal/src/main/resources/etc/.gitignore b/aai-traversal/src/main/resources/etc/.gitignore
new file mode 100644
index 0000000..48bd738
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/.gitignore
@@ -0,0 +1 @@
+/oxm/
diff --git a/aai-traversal/src/main/resources/etc/appprops/Introscope.properties b/aai-traversal/src/main/resources/etc/appprops/Introscope.properties
new file mode 100644
index 0000000..319381e
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/Introscope.properties
@@ -0,0 +1,8 @@
+#CSI environment uses the Introscope java agent for monitoring services. The AJSC has provided an implementation class that
+#provides basic information to the Introscope Enterprise Manager for each http request/response. 
+
+introscopeEventClass=com.att.ajsc.introscope.IntroscopeEventNotifierImpl
+serviceName=N/A
+conversationId=N/A
+uniqueID=N/A
+userID=N/A
diff --git a/aai-traversal/src/main/resources/etc/appprops/PostProcessorInterceptors.properties b/aai-traversal/src/main/resources/etc/appprops/PostProcessorInterceptors.properties
new file mode 100644
index 0000000..ca31a26
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/PostProcessorInterceptors.properties
@@ -0,0 +1,3 @@
+#This properties file is for defining any PostProcessorInterceptors that have been created for your AJSC service.
+
+/**=org.onap.aai.interceptors.PostAaiAjscInterceptor
diff --git a/aai-traversal/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties b/aai-traversal/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties
new file mode 100644
index 0000000..4aa7445
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/aaiEventDMaaPPublisher.properties
@@ -0,0 +1,4 @@
+Protocol=http
+contenttype=application/json
+host=localhost:3904
+topic=AAI-EVENT
diff --git a/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties
new file mode 100644
index 0000000..0c263be
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/aaiconfig.properties
@@ -0,0 +1,120 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+
+####################################################################
+#  REMEMBER TO THINK ABOUT ENVIRONMENTAL DIFFERENCES AND CHANGE THE
+#  TEMPLATE AND *ALL* DATAFILES
+####################################################################
+
+aai.config.checktime=1000
+
+# this could come from siteconfig.pl?
+aai.config.nodename=AutomaticallyOverwritten
+
+aai.logging.hbase.interceptor=true
+aai.logging.hbase.enabled=true
+aai.logging.hbase.logrequest=true
+aai.logging.hbase.logresponse=true
+
+aai.logging.trace.enabled=true
+aai.logging.trace.logrequest=false
+aai.logging.trace.logresponse=false
+
+aai.transaction.logging=true
+aai.transaction.logging.get=true
+aai.transaction.logging.post=true
+
+aai.tools.enableBasicAuth=true
+aai.tools.username=AAI
+aai.tools.password=AAI
+
+aai.server.url.base=https://localhost:8443/aai/
+aai.server.url=https://localhost:8443/aai/v12/
+aai.global.callback.url=https://localhost:8443/aai/
+
+aai.auth.cspcookies_on=false
+aai.dbmodel.filename=ex5.json
+aai.truststore.filename=aai_keystore
+aai.truststore.passwd.x=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+aai.keystore.filename=aai-client-cert.p12
+aai.keystore.passwd.x=
+
+# for transaction log
+hbase.table.name=aailogging-dev1.dev
+hbase.notificationTable.name=aainotification-dev1.dev
+hbase.table.timestamp.format=YYYYMMdd-HH:mm:ss:SSS
+hbase.zookeeper.quorum=ONAPserverTBD
+hbase.zookeeper.property.clientPort=2181
+hbase.zookeeper.znode.parent=/hbase
+
+
+# single primary server
+aai.primary.filetransfer.serverlist=ONAPserverTBD
+aai.primary.filetransfer.primarycheck=echo:8443/aai/util/echo
+aai.primary.filetransfer.pingtimeout=5000
+aai.primary.filetransfer.pingcount=5
+
+#rsync properties
+aai.rsync.command=rsync
+aai.rsync.options.list=-v|-t
+aai.rsync.remote.user=aaiadmin
+aai.rsync.enabled=y
+
+aai.notification.current.version=v12
+aai.notificationEvent.default.status=UNPROCESSED
+aai.notificationEvent.default.eventType=AAI-EVENT
+aai.notificationEvent.default.domain=devINT1
+aai.notificationEvent.default.sourceName=aai
+aai.notificationEvent.default.sequenceNumber=0
+aai.notificationEvent.default.severity=NORMAL
+aai.notificationEvent.default.version=v12
+# This one lets us enable/disable resource-version checking on updates/deletes
+aai.resourceversion.enableflag=true
+aai.logging.maxStackTraceEntries=10
+aai.default.api.version=v12
+
+# Used by Model-processing code
+aai.model.delete.sleep.per.vtx.msec=500
+aai.model.query.resultset.maxcount=50
+aai.model.query.timeout.sec=90
+ 
+aai.model.proc.max.levels=50
+aai.edgeTag.proc.max.levels=50
+
+aai.dmaap.workload.enableEventProcessing=true
+
+aai.realtime.clients=RO,SDNC,MSO
+
+aai.server.rebind=g
+
+aai.jms.enable=false
+
+#timeout for traversal enabled flag
+aai.traversal.timeoutenabled=true
+
+#timeout app specific
+aai.traversal.timeout.appspecific=JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAI-FILEGEN-GFPIP,-1
+
+#default timeout limit added for traversal if not overridden (in ms)
+aai.traversal.timeoutlimit=180000
+
+
diff --git a/aai-traversal/src/main/resources/etc/appprops/default-logback.xml b/aai-traversal/src/main/resources/etc/appprops/default-logback.xml
new file mode 100644
index 0000000..655157b
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/default-logback.xml
@@ -0,0 +1,43 @@
+<!--
+
+    ============LICENSE_START=======================================================
+    org.onap.aai
+    ================================================================================
+    Copyright © 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=========================================================
+
+    ECOMP is a trademark and service mark of AT&T Intellectual Property.
+
+-->
+<configuration debug="false">
+	<property name="defaultPattern" value="%d{MM/dd-HH:mm:ss.SSS}|%logger|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|%msg%n" />
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${defaultPattern}</pattern>
+		</encoder>
+	</appender>
+
+	<logger name="org.reflections" level="WARN"/>
+	<logger name="org.apache.zookeeper" level="WARN"/>
+	<logger name="org.apache.hadoop" level="WARN"/>
+	<logger name="com.thinkaurelius" level="WARN"/>
+	<logger name="ch.qos.logback.classic" level="WARN" />
+	<logger name="ch.qos.logback.core" level="WARN" />
+
+	<root level="INFO">
+		<appender-ref ref="STDOUT"/>
+	</root>
+</configuration>
diff --git a/aai-traversal/src/main/resources/etc/appprops/error.properties b/aai-traversal/src/main/resources/etc/appprops/error.properties
new file mode 100644
index 0000000..ba71275
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/error.properties
@@ -0,0 +1,172 @@
+# Adding comment trying to trigger a build
+#-------------------------------------------------------------------------------                                                                                            ----------
+#Key=Disposition:Category:Severity:Error Code:HTTP ResponseCode:RESTError Code:Error Message
+#-------------------------------------------------------------------------------                                                                                            ----------
+# testing code, please don't change unless error utility source code changes
+AAI_TESTING=5:2:WARN:0000:400:0001:Error code for testing
+
+# General success
+AAI_0000=0:0:INFO:0000:200:0000:Success
+
+# health check success
+AAI_0001=0:0:INFO:0001:200:0001:Success X-FromAppId=%1 X-TransactionId=%2 
+AAI_0002=0:0:INFO:0002:200:0001:Successful health check
+
+# Success with additional info
+AAI_0003=0:3:INFO:0003:202:0003:Success with additional info performing %1 on %2. Added %3 with key %4
+AAI_0004=0:3:INFO:0004:202:0003:Added prerequisite object to db
+
+#--- aairest: 3000-3299
+# svc errors
+AAI_3000=5:2:INFO:3000:400:3000:Invalid input performing %1 on %2
+AAI_3001=5:6:INFO:3001:404:3001:Resource not found for %1 using id %2
+AAI_3002=5:1:WARN:3002:400:3002:Error writing output performing %1 on %2
+AAI_3003=5:1:WARN:3003:400:3003:Failed to make edge to missing target node of type %3 with keys %4 performing %1 on %2
+AAI_3005=5:6:WARN:3005:404:3001:Node cannot be directly accessed for read, must be accessed via ancestor(s)
+AAI_3006=5:6:WARN:3006:404:3001:Node cannot be directly accessed for write, must be accessed via ancestor(s)
+AAI_3007=5:6:INFO:3007:410:3007:This version (%1) of the API is retired, please migrate to %2
+AAI_3008=5:6:WARN:3008:400:3008:URI is not encoded in UTF-8
+AAI_3009=5:6:WARN:3009:400:3002:Malformed URL
+AAI_3010=5:6:WARN:3010:400:3002:Cannot write via this URL
+AAI_3011=5:6:WARN:3011:400:3000:Unknown XML namespace used in payload
+AAI_3012=5:6:WARN:3012:400:3012:Unrecognized AAI function
+AAI_3013=5:6:WARN:3013:400:3013:Query payload missing required parameters %1
+AAI_3014=5:6:WARN:3014:400:3014:Query payload is invalid %1
+# 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
+AAI_3102=5:1:WARN:3102:400:3102:Error parsing input performing %1 on %2
+AAI_3300=5:1:WARN:3300:403:3300:Unauthorized
+AAI_3301=5:1:WARN:3301:401:3301:Stale credentials
+AAI_3302=5:1:WARN:3302:401:3301:Not authenticated
+AAI_3303=5:1:WARN:3303:403:3300:Too many objects would be returned by this request, please refine your request and retry
+
+#--- aaigen: 4000-4099
+AAI_4000=5:4:ERROR:4000:500:3002:Internal Error
+AAI_4001=5:4:FATAL:4001:500:3002:Configuration file not found
+AAI_4002=5:4:FATAL:4002:500:3002:Error reading Configuration file
+AAI_4003=5:4:ERROR:4003:500:3002:Error writing to log file
+AAI_4004=5:4:FATAL:4004:500:3002:Error reading/parsing the error properties file
+AAI_4005=5:4:FATAL:4005:500:3002:Missing or invalid configuration parameter
+AAI_4006=5:4:FATAL:4006:500:3002:Unexpected error in service
+AAI_4007=5:4:WARN:4007:500:3102:Input parsing error
+AAI_4008=5:4:ERROR:4008:500:3002:Output parsing error
+AAI_4009=4:0:WARN:4009:400:3000:Invalid X-FromAppId in header
+AAI_4010=4:0:WARN:4010:400:3000:Invalid X-TransactionId in header
+AAI_4011=5:4:ERROR:4011:500:3002:Missing data for REST error response
+AAI_4014=4:0:WARN:4014:400:3000:Invalid Accept header
+AAI_4015=4:0:WARN:4015:400:3000:You must provide at least one indexed property
+AAI_4016=4:0:WARN:4016:400:3000:The depth parameter must be a number or the string "all"
+AAI_4017=5:2:INFO:4017:400:3000:Could not set property
+AAI_4018=5:2:WARN:4018:400:3000:Unable to convert the string to integer
+#--- aaidbmap: 5102-5199
+AAI_5102=5:4:FATAL:5102:500:3002:Graph database is null after open
+AAI_5105=5:4:ERROR:5105:500:3002:Unexpected error reading/updating database
+AAI_5106=5:4:WARN:5106:404:3001:Node not found
+AAI_5107=5:2:WARN:5107:400:3000:Required information missing
+AAI_5108=5:2:WARN:5108:200:0:Unexpected information in request being ignored
+
+#--- aaidbgen: 6101-6199
+AAI_6101=5:4:ERROR:6101:500:3002:null TitanGraph object passed
+AAI_6102=5:4:WARN:6102:400:3000:Passed-in property is not valid for this nodeType
+AAI_6103=5:4:WARN:6103:400:3000:Required Node-property not found in input data
+AAI_6104=5:4:WARN:6104:400:3000:Required Node-property was passed with no data
+AAI_6105=5:4:WARN:6105:400:3000:Node-Key-Property not defined in DbMaps
+AAI_6106=5:4:WARN:6106:400:3000:Passed-in property is not valid for this edgeType
+AAI_6107=5:4:WARN:6107:400:3000:Required Edge-property not found in input data
+AAI_6108=5:4:WARN:6108:400:3000:Required Edge-property was passed with no data
+AAI_6109=5:4:WARN:6109:400:3000:Bad dependent Node value
+AAI_6110=5:4:ERROR:6110:400:3100:Node cannot be deleted
+AAI_6111=5:4:WARN:6111:400:3000:JSON processing error
+AAI_6112=5:4:ERROR:6112:400:3000:More than one node found by getUniqueNode()
+AAI_6114=5:4:INFO:6114:404:3001:Node Not Found
+AAI_6115=5:4:ERROR:6115:400:3000:Unrecognized NodeType
+AAI_6116=5:4:ERROR:6116:400:3000:Unrecognized Property
+AAI_6117=5:4:ERROR:6117:400:3000:Uniqueness constraint violated
+AAI_6118=5:4:WARN:6118:400:3000:Required Field not passed.
+AAI_6120=5:4:WARN:6120:400:3000:Bad Parameter Passed
+AAI_6121=5:4:ERROR:6121:400:3000:Problem with internal AAI reference data
+AAI_6122=5:4:ERROR:6122:400:3000:Data Set not complete in DB for this request
+AAI_6123=5:4:ERROR:6123:500:3000:Bad Data found by DataGrooming Tool - Investigate
+AAI_6124=5:4:ERROR:6124:500:3000:File read/write error
+AAI_6125=5:4:WARN:6125:500:3000:Problem Pulling Data Set
+AAI_6126=5:4:ERROR:6126:400:3000:Edge cannot be deleted
+AAI_6127=5:4:INFO:6127:404:3001:Edge Not Found
+AAI_6128=5:4:INFO:6128:500:3000:Unexpected error
+AAI_6129=5:4:INFO:6129:404:3003:Error making edge to target node
+AAI_6130=5:4:WARN:6130:412:3000:Precondition Required
+AAI_6131=5:4:WARN:6131:412:3000:Precondition Failed
+AAI_6132=5:4:WARN:6132:400:3000:Bad Model Definition 
+AAI_6133=5:4:WARN:6133:400:3000:Bad Named Query Definition
+AAI_6134=5:4:ERROR:6134:500:6134:Could not persist transaction to storage back end. Exhausted retry amount
+AAI_6135=5:4:WARN:6135:412:3000:Resource version specified on create
+AAI_6136=5:4:ERROR:6136:400:3000:Object cannot hold multiple items
+AAI_6137=5:4:ERROR:6137:400:3000:Cannot perform writes on multiple vertices
+AAI_6138=5:4:ERROR:6138:400:3000:Cannot delete multiple vertices
+AAI_6139=5:4:ERROR:6139:404:3000:Attempted to add edge to vertex that does not exist
+AAI_6140=5:4:ERROR:6140:400:3000:Edge multiplicity violated
+AAI_6141=5:4:WARN:6141:400:3000:Please Refine Query
+AAI_6142=5:4:INFO:6142:400:3000:Retrying transaction
+AAI_6143=5:4:INFO:6143:400:3000:Ghost vertex found
+AAI_6144=5:4:WARN:6144:400:3000:Cycle found in graph
+AAI_6145=5:4:ERROR:6145:400:3000:Cannot create a nested/containment edge via relationship
+AAI_6146=5:4:ERROR:6146:400:3000:Ambiguous identity map found, use a URI instead
+AAI_6147=5:4:ERROR:6147:400:3000:Payload Limit Reached, reduce payload
+
+#--- aaicsvp: 7101-7199
+AAI_7101=5:4:ERROR:7101:500:3002:Unexpected error in CSV file processing
+AAI_7102=5:4:ERROR:7102:500:3002:Error in cleanup temporary directory
+#AAI_7103=4:2:ERROR:7103:500:3002:Unsupported user
+AAI_7104=5:4:ERROR:7104:500:3002:Failed to create directory
+AAI_7105=5:4:ERROR:7105:500:3002:Temporary directory exists
+AAI_7106=5:4:ERROR:7106:500:3002:Cannot delete
+AAI_7107=5:4:ERROR:7107:500:3002:Input file does not exist
+AAI_7108=5:4:ERROR:7108:500:3002:Output file does not exist
+AAI_7109=5:4:ERROR:7109:500:3002:Error closing file
+AAI_7110=5:4:ERROR:7110:500:3002:Error loading/reading properties file
+AAI_7111=5:4:ERROR:7111:500:3002:Error executing shell script
+AAI_7112=5:4:ERROR:7112:500:3002:Error creating output file
+AAI_7113=5:4:ERROR:7113:500:3002:Trailer record error
+AAI_7114=5:4:ERROR:7114:500:3002:Input file error
+AAI_7115=5:4:ERROR:7115:500:3002:Unexpected error
+AAI_7116=5:4:ERROR:7116:500:3002:Request error 
+AAI_7117=5:4:ERROR:7117:500:3002:Error in get http client object
+AAI_7118=5:4:ERROR:7118:500:3002:Script Error
+AAI_7119=5:4:ERROR:7119:500:3002:Unknown host
+
+#--- aaisdnc: 7201-7299
+AAI_7202=5:4:ERROR:7202:500:3002:Error getting connection to odl
+AAI_7203=5:4:ERROR:7203:500:3002:Unexpected error calling DataChangeNotification API
+AAI_7204=5:4:ERROR:7204:500:3002:Error returned by DataChangeNotification API
+AAI_7205=5:4:ERROR:7205:500:3002:Unexpected error running notifySDNCOnUpdate
+#AAI_7206=5:4:ERROR:7206:500:3002:Invalid data returned from ODL
+
+#--- NotificationEvent, using UEB space
+AAI_7350=5:4:ERROR:7305:500:3002:Notification event creation failed
+
+#--- aairestctlr: 7401-7499
+AAI_7401=5:4:ERROR:7401:500:3002:Error connecting to AAI REST API
+AAI_7402=5:4:ERROR:7402:500:3002:Unexpected error
+AAI_7403=5:4:WARN:7403:400:3001:Request error
+AAI_7404=5:4:INFO:7404:404:3001:Node not found
+AAI_7405=5:4:WARN:7405:200:0:UUID not formatted correctly, generating UUID
+AAI_7406=5:4:ERROR:7406:400:7406:Request Timed Out
+
+#--- aaicsiovals: 7501-7599
+#AAI_7501=5:4:WARN:7501:500:3002:Error getting connection to CSI-OVALS
+AAI_7502=5:4:WARN:7502:500:3002:Bad parameter when trying to build request for CSI-OVALS
+AAI_7503=5:4:WARN:7503:500:3002:Error returned by CSI-OVALS
+
+#--- aaiauth: 9101-9199
+AAI_9101=5:0:WARN:9101:403:3300:User is not authorized to perform function
+#AAI_9102=5:0:WARN:9102:401:3301:Refresh credentials from source
+#AAI_9103=5:0:WARN:9103:403:3300:User not found
+#AAI_9104=5:0:WARN:9104:401:3302:Authentication error
+#AAI_9105=5:0:WARN:9105:403:3300:Authorization error
+#AAI_9106=5:0:WARN:9106:403:3300:Invalid AppId
+#AAI_9107=5:0:WARN:9107:403:3300:No Username in Request
+AAI_9107=5:0:WARN:9107:403:3300:SSL is not provided in request, please contact admin
+
+#--- aaiinstar: 9201-9299
+#AAI_9201=5:4:ERROR:9201:500:3002:Unable to send notification
+AAI_9202=5:4:ERROR:9202:500:3002:Unable to start a thread
diff --git a/aai-traversal/src/main/resources/etc/appprops/gremlin-server-config.yaml b/aai-traversal/src/main/resources/etc/appprops/gremlin-server-config.yaml
new file mode 100644
index 0000000..a9de31f
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/gremlin-server-config.yaml
@@ -0,0 +1,25 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+
+hosts: [localhost]
+port: 8182
+serializer: { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0 }
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/appprops/logging.properties b/aai-traversal/src/main/resources/etc/appprops/logging.properties
new file mode 100644
index 0000000..e029cc4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/logging.properties
@@ -0,0 +1,128 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+# this is where we will limit logging on components
+org.apache.hadoop.level=WARNING
+org.apache.zookeeper.level=WARNING
+org.reflections.level=WARNING
+com.thinkaurelius.level=WARNING
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4host-manager.org.apache.juli.FileHandler.level = FINE
+4host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = INFO
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 4host-manager.org.apache.juli.FileHandler
+
+# For example, set the org.apache.catalina.util.LifecycleBase logger to log
+# each component that extends LifecycleBase changing state:
+#org.apache.catalina.util.LifecycleBase.level = FINE
+
+# To see debug messages in TldLocationsCache, uncomment the following line:
+#org.apache.jasper.compiler.TldLocationsCache.level = FINE
+
+
+################################
+# OpenEJB/TomEE specific loggers
+################################
+#
+# ACTIVATE LEVEL/HANDLERS YOU WANT
+# IF YOU ACTIVATE 5tomee.org.apache.juli.FileHandler
+# ADD IT TO handlers LINE LIKE:
+#
+# handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4host-manager.org.apache.juli.FileHandler, 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+#
+# LEVELS:
+# =======
+#
+# OpenEJB.level             = WARNING
+# OpenEJB.options.level     = INFO
+# OpenEJB.server.level      = INFO
+# OpenEJB.startup.level     = INFO
+# OpenEJB.startup.service.level = WARNING
+# OpenEJB.startup.config.level = INFO
+# OpenEJB.hsql.level        = INFO
+# CORBA-Adapter.level       = WARNING
+# Transaction.level         = WARNING
+# org.apache.activemq.level = SEVERE
+# org.apache.geronimo.level = SEVERE
+# openjpa.level             = WARNING
+# OpenEJB.cdi.level         = INFO
+# org.apache.webbeans.level = INFO
+# org.apache.openejb.level = FINE
+#
+# HANDLERS:
+# =========
+#
+# OpenEJB.handlers             = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.options.handlers     = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.server.handlers      = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.startup.handlers     = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.startup.service.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.startup.config.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.hsql.handlers        = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# CORBA-Adapter.handlers       = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# Transaction.handlers         = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# org.apache.activemq.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# org.apache.geronimo.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# openjpa.handlers             = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# OpenEJB.cdi.handlers         = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# org.apache.webbeans.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+# org.apache.openejb.handlers = 5tomee.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+#
+# TOMEE HANDLER SAMPLE:
+# =====================
+#
+# 5tomee.org.apache.juli.FileHandler.level = FINEST
+# 5tomee.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+# 5tomee.org.apache.juli.FileHandler.prefix = tomee.
+
diff --git a/aai-traversal/src/main/resources/etc/appprops/methodMapper.properties b/aai-traversal/src/main/resources/etc/appprops/methodMapper.properties
new file mode 100644
index 0000000..d6c1158
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/methodMapper.properties
@@ -0,0 +1,24 @@
+{
+    "ActiveAndAvailableInventory-Traversal" : [{
+            "logicalName" : "getAAIResource",
+            "method" : "get",
+            "url" : "/aai/*"
+        }, {
+            "logicalName" : "putAAIResource",
+            "method" : "put",
+            "url" : "/aai/*"
+        }, {
+            "logicalName" : "deleteAAIResource",
+            "method" : "delete",
+            "url" : "/aai/*"
+        }, {
+            "logicalName" : "postAAIResource",
+            "method" : "post",
+            "url" : "/aai/*"
+        }, {
+            "logicalName" : "patchAAIResource",
+            "method" : "patch",
+            "url" : "/aai/*"
+        }
+    ]
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/appprops/preferredRoute.txt b/aai-traversal/src/main/resources/etc/appprops/preferredRoute.txt
new file mode 100644
index 0000000..662b0aa
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/preferredRoute.txt
@@ -0,0 +1 @@
+preferredRouteKey=MR1
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/appprops/titan-cached.properties b/aai-traversal/src/main/resources/etc/appprops/titan-cached.properties
new file mode 100644
index 0000000..0106788
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/titan-cached.properties
@@ -0,0 +1,40 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+
+query.fast-property=true
+# the following parameters are not reloaded automatically and require a manual bounce
+#storage.backend=inmemory
+storage.backend=inmemory
+storage.hostname=localhost
+
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=aaigraph-dev02
+storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+#caching on
+cache.db-cache = true
+cache.db-cache-clean-wait = 20
+cache.db-cache-time = 180000
+cache.db-cache-size = 0.3
+
+#load graphson file on startup
+load.snapshot.file=false
diff --git a/aai-traversal/src/main/resources/etc/appprops/titan-realtime.properties b/aai-traversal/src/main/resources/etc/appprops/titan-realtime.properties
new file mode 100644
index 0000000..ace08b3
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/appprops/titan-realtime.properties
@@ -0,0 +1,37 @@
+#
+# ============LICENSE_START=======================================================
+# org.onap.aai
+# ================================================================================
+# Copyright © 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=========================================================
+#
+# ECOMP is a trademark and service mark of AT&T Intellectual Property.
+#
+
+query.fast-property=true
+# the following parameters are not reloaded automatically and require a manual bounce
+#storage.backend=inmemory
+storage.backend=inmemory
+storage.hostname=localhost
+
+#schema.default=none
+storage.lock.wait-time=300
+storage.hbase.table=aaigraph-dev02
+storage.hbase.ext.zookeeper.znode.parent=/hbase-unsecure
+# Setting db-cache to false ensure the fastest propagation of changes across servers
+cache.db-cache = false
+
+#load graphson file on startup
+load.snapshot.file=false
diff --git a/aai-traversal/src/main/resources/etc/auth/aai_keystore b/aai-traversal/src/main/resources/etc/auth/aai_keystore
new file mode 100644
index 0000000..1ddef0c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/auth/aai_keystore
diff --git a/aai-traversal/src/main/resources/etc/query/stored-queries.json b/aai-traversal/src/main/resources/etc/query/stored-queries.json
new file mode 100644
index 0000000..8d18fd7
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/query/stored-queries.json
@@ -0,0 +1,266 @@
+{
+  "stored-queries":[{
+    "cloud-region-fromVnf":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x').createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vserver').store('x').createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').store('x').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "linked-devices":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'l-interface'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'lag-interface'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'newvce', 'l-interface'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface')).dedup().until(builder.newInstance().getVerticesByProperty('aai-node-type', new ArrayList<>(Arrays.asList('generic-vnf','newvce','vserver')))).repeat(builder.newInstance().union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'lag-interface', 'l-interface'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'lag-interface'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'vlan'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vlan', 'l-interface'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'lag-interface', 'logical-link'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'lag-interface'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l-interface', 'logical-link'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'l-interface'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vlan', 'logical-link'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'vlan'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'generic-vnf'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'lag-interface', 'generic-vnf'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'newvce'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'vserver')).dedup().simplePath()).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "cloud-region-sites":{
+      "query":{
+        "required-properties":["owner"]
+      },
+      "stored-query":"builder.getVerticesByProperty('aai-node-type', 'cloud-region').getVerticesByProperty('cloud-owner', owner).store('x').createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'complex').store('x').cap('x').unfold()"
+    }
+  },{
+    "pserver-fromConfiguration":{
+      "stored-query":"builder.store('x').createEdgeTraversal(EdgeType.COUSIN, 'configuration', 'logical-link').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'l-interface').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'generic-vnf').store('x').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pnf').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "spaas-topology-fromServiceInstance":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'flavor').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'image').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'vserver', 'l-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l-interface', 'logical-link').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'pserver', 'p-interface').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x'))).cap('x').unfold().dedup()"
+    }
+  },{
+    "vnf-instances-fromServiceInstancebyModelVersion":{
+      "query":{
+        "required-properties":["vnfType","modelVersionId"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').getVerticesByProperty('vnf-type', vnfType).getVerticesByProperty('model-version-id-local', modelVersionId).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "pnf-topology":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'pnf', 'p-interface').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link')).as('item').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x').createEdgeTraversal(EdgeType.COUSIN, 'physical-link', 'p-interface').where(builder.newInstance().not(builder.newInstance().cap('item'))).store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'p-interface', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'p-interface', 'pnf').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pnf', 'complex').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "so-request-vfModule":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vf-module', 'generic-vnf').store('x').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vf-module', 'vserver').createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vf-module', 'volume-group').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "ucpe-instance":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'cloud-region').createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'complex')).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "images-fromCloudRegionNfType":{
+      "query":{
+        "required-properties":["nfType"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.TREE, 'cloud-region', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'vserver').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').getVerticesByProperty('nf-type',nfType)).createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'image').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "site-l3network-cloudRegion":{
+      "stored-query":"builder.store('x').createEdgeTraversal(EdgeType.COUSIN, 'complex', 'l3-network').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-network', 'cloud-region').store('x').cap('x').unfold()"
+    }
+  },{
+    "pnf-fromModel-byRegion":{
+      "query":{
+        "required-properties":["equipVendor","equipModel","cloudRegionId"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'pnf').getVerticesByProperty('equip-vendor', equipVendor).getVerticesByProperty('equip-model', equipModel).where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pnf', 'complex').createEdgeTraversal(EdgeType.COUSIN, 'complex', 'cloud-region').getVerticesByProperty('cloud-region-id', cloudRegionId)).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "topology-fromCloudRegionIdandServiceId":{
+      "query":{
+        "required-properties":["serviceId"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.TREE, 'cloud-region', 'availability-zone').createEdgeTraversal(EdgeType.COUSIN, 'availability-zone', 'generic-vnf').getVerticesByProperty('service-id',serviceId).union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'flavor').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'image').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'vserver', 'volume').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'vnfc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'snapshot').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'vf-module').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'vserver', 'l-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l-interface', 'logical-link').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x')))).cap('x').unfold().dedup()"
+    }
+  },{
+    "network-name-fromNetwork-role":{
+      "query":{
+        "required-properties":["networkRole"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'l3-network').getVerticesByProperty('network-role', networkRole).store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-network', 'network-policy').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "service-sites":{
+      "query":{
+        "required-properties":["customerId","type"]
+      },
+      "stored-query":"builder.getVerticesByProperty('global-customer-id', customerId).createEdgeTraversal(EdgeType.TREE, 'customer', 'service-subscription').getVerticesByProperty('service-type', type).createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'service-instance').store('x').createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').store('x').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region')).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "pserver-fromConfigurationFilterInterfaceId":{
+      "query":{
+        "required-properties":["interfaceId"]
+      },
+      "stored-query":"builder.store('x').createEdgeTraversal(EdgeType.COUSIN, 'configuration', 'logical-link').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'l-interface').getVerticesByProperty('interface-id', interfaceId).store('x')).union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'logical-link', 'generic-vnf').store('x').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pnf').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "cloudRegion-fromCountry":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'complex', 'cloud-region').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "sites-byCountryFilterCloudRegionVer":{
+      "query":{
+        "required-properties":["cloudRegionVersion"]
+      },
+      "stored-query":"builder.where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'complex', 'l3-network').createEdgeTraversal(EdgeType.COUSIN, 'l3-network', 'cloud-region').getVerticesByProperty('cloud-region-version', cloudRegionVersion)).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "vnf-topology-fromVfModule":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.TREE, 'vf-module', 'generic-vnf').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'allotted-resource').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'vf-module').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'volume-group').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'l-interface').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'),),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').store('x').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'),)).cap('x').unfold().dedup()"
+    }
+  },{
+    "serviceModels-byDistributionStatus":{
+      "query":{
+        "required-properties":["distributionStatus"]
+      },
+      "stored-query":"builder.getVerticesByProperty('model-type', 'service').where(builder.newInstance().createEdgeTraversal(EdgeType.TREE,'model', 'model-ver').getVerticesByProperty('distribution-status', distributionStatus)).store('x').createEdgeTraversal(EdgeType.TREE,'model', 'model-ver').getVerticesByProperty('distribution-status', distributionStatus).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "vserver-fromVnf":{
+      "query":{
+        "required-properties":["nfcFunction"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').getVerticesByProperty('nfc-function', nfcFunction).store('x').createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vserver').store('x').createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "sites-byCloudRegionId":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'l3-network').createEdgeTraversal(EdgeType.COUSIN, 'l3-network', 'complex').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "availabilityZoneAndComplex-fromCloudRegion":{
+      "stored-query":"builder.union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'cloud-region', 'availability-zone').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'complex').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "locationNetTypeNetRole-fromCloudRegion":{
+      "stored-query":"builder.store('x').createEdgeTraversal(EdgeType.COUSIN, 'cloud-region', 'complex').store('x').createEdgeTraversal(EdgeType.COUSIN, 'complex', 'l3-network').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "service-fromPserverandSubsName":{
+      "query":{
+        "required-properties":["subscriberName"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').where(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').where(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').getVerticesByProperty('subscriber-name', subscriberName)).store('x')).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "nfType-fromCloudRegion":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.TREE, 'cloud-region', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "sites-byCountryFilterCloudRegionId":{
+      "query":{
+        "required-properties":["cloudRegionId"]
+      },
+      "stored-query":"builder.where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'complex', 'l3-network').createEdgeTraversal(EdgeType.COUSIN, 'l3-network', 'cloud-region').getVerticesByProperty('cloud-region-id', cloudRegionId)).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "complex-fromVnf":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pserver').store('x').createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x').createEdgeTraversal(EdgeType.COUSIN,'pserver', 'complex')).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "queryvnfFromModelbyRegion":{
+      "query":{
+        "required-properties":["cloudRegionId"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').getVerticesByProperty('cloud-region-id', cloudRegionId)).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "colocated-devices":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'pserver', 'p-interface').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'complex', 'pserver').store('x').createEdgeTraversal(EdgeType.TREE, 'pserver', 'p-interface').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'complex', 'pnf').store('x').createEdgeTraversal(EdgeType.TREE, 'pnf', 'p-interface').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x'))).cap('x').unfold().dedup()"
+    }
+  },{
+    "cloudRegion-fromCountryCloudRegionVersion":{
+      "query":{
+        "required-properties":["cloudRegionVersion"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'complex', 'cloud-region').getVerticesByProperty('cloud-region-version', cloudRegionVersion).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "cloudRegion-fromNfType":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "cloudRegion-fromNfTypeVendorVersion":{
+      "query":{
+        "required-properties":["nfType"]
+      },
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'image', 'vserver').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').getVerticesByProperty('nf-type',nfType)).createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "vnf-topology-fromServiceInstance":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'allotted-resource').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'vf-module').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'volume-group').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'l-interface').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').store('x').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x')))).cap('x').unfold().dedup()"
+    }
+  },{
+    "ucpe-topology":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'pserver', 'p-interface').where(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link')).as('item').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x').createEdgeTraversal(EdgeType.COUSIN, 'physical-link', 'p-interface').where(builder.newInstance().not(builder.newInstance().cap('item'))).store('x').createEdgeTraversal(EdgeType.TREE, 'p-interface', 'pnf').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'generic-vnf').store('x').as('vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnf-image').store('x').select('vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x').createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').store('x').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').store('x').as('vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnf-image').store('x').select('vnf').createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x').createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').store('x').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "topology-summary":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'vnfc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').store('x').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'image').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'flavor').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x').createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').store('x'))).cap('x').unfold().dedup()"
+    }
+  },{
+    "topology-detail":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'platform').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'line-of-business').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'owning-entity').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'project').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'vserver', 'l-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').store('x'))).cap('x').unfold().dedup()"
+    }
+  },{
+    "vnfs-fromPserver":{
+      "query":{
+        "required-properties":["hostname"]
+      },
+      "stored-query":"builder.where(builder.newInstance().union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pserver').getVerticesByProperty('hostname', hostname),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').getVerticesByProperty('hostname', hostname))).store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "pending-topology-detail":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'platform').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'line-of-business').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'owning-entity').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'project').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vnfc', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vnfc', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vip-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'vip-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vip-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'vip-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x')).dedup()).cap('x').unfold().dedup()"
+    }
+  },{
+    "vnfs-fromServiceInstance":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "owning-entity-fromService-instance":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN,'service-instance', 'owning-entity').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "pservers-fromVnf":{
+      "stored-query":"builder.union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "fn-topology":{
+      "stored-query":"builder.union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'line-of-business', 'generic-vnf').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').store('x')).dedup().union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pnf').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "edge-tag":{
+      "stored-query":"builder.emit().repeat(builder.newInstance().union(builder.newInstance().outE().getVerticesByProperty(tag, \"OUT\").inV(), builder.newInstance().inE().getVerticesByProperty(tag, \"IN\").outV()).dedup())"
+    }
+  },{
+    "topology-detail-fromVserver":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'vserver', 'l-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'complex').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'generic-vnf').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'platform').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'line-of-business').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'owning-entity').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'project').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x'))).cap('x').unfold().dedup()"
+    }
+  },{
+    "vserverlogicallink-frompServer":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.COUSIN, 'pserver', 'vserver').store('x').createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.COUSIN, 'l-interface', 'logical-link').store('x').cap('x').unfold().dedup()"
+    }
+  },{
+    "vnf-topology-fromVnf":{
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'service-instance').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'allotted-resource').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'vf-module').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'volume-group').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'l-interface').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'),),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'tenant').store('x').createEdgeTraversal(EdgeType.TREE, 'tenant', 'cloud-region').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'),)).cap('x').unfold().dedup()"
+    }
+  },{
+    "service-topology":{
+      "stored-query":"builder.store('x').createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'generic-vnf').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnfc').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vip-ipv4-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'vip-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vnfc', 'vip-ipv6-address-list').store('x').createEdgeTraversal(EdgeType.COUSIN, 'vip-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vnfc', 'l3-interface-ipv4-address-list').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x') ), builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vnfc', 'l3-interface-ipv6-address-list').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x') ) ), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vserver').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.TREE,'vserver','tenant').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vserver', 'l-interface').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv4-address-list').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv4-address-list', 'subnet').store('x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x') ), builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x').union( builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'l3-network').store('x'), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'l3-interface-ipv6-address-list', 'subnet').store( 'x').createEdgeTraversal(EdgeType.TREE, 'subnet', 'l3-network').store('x') ) ), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'vserver', 'pserver').store('x') ), builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'pserver').store('x').createEdgeTraversal(EdgeType.TREE, 'pserver', 'p-interface').store('x').createEdgeTraversal(EdgeType.COUSIN, 'p-interface', 'physical-link').store('x') ).cap('x').unfold().dedup()"
+    }
+  },{
+    "access-service-fromServiceInstance":{ 
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'service-instance', 'service-subscription').store('x').createEdgeTraversal(EdgeType.TREE, 'service-subscription', 'customer').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'service-instance', 'forwarding-path').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'forwarding-path', 'configuration').store('x').createEdgeTraversal(EdgeType.TREE, 'configuration', 'evc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'forwarding-path', 'forwarder').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'forwarder', 'configuration').store('x').createEdgeTraversal(EdgeType.TREE, 'configuration', 'forwarder-evc').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'forwarder', 'p-interface').store('x').createEdgeTraversal(EdgeType.TREE, 'p-interface', 'pnf').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'forwarder', 'lag-interface').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'lag-interface', 'pnf').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'lag-interface', 'logical-link').getVerticesByProperty('link-type', 'LAG').store('x'))))).cap('x').unfold().dedup()"
+    }
+  },{
+    "count-vnf-byVnfType":{ 
+      "stored-query":"builder.getVerticesByProperty('aai-node-type', 'generic-vnf').groupCount().by('vnf-type').store('x').unfold()"
+    }  
+  },{
+    "pservers-withNoComplex":{ 
+      "stored-query":"builder.getVerticesByProperty('aai-node-type', 'pserver').where(builder.newInstance().not(builder.newInstance().both().getVerticesByProperty('aai-node-type', 'complex'))).store('x').unfold()"
+    }  
+  },{
+    "gfp-vserver-data":{
+      "stored-query":"builder.createEdgeTraversal(EdgeType.TREE,   'vserver', 'l-interface').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'vlan').store('x')).cap('x').unfold().dedup()"
+    }
+  },{
+    "gfp-vnf-data":{ 
+      "stored-query":"builder.store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'l-interface').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE,   'l-interface', 'l3-interface-ipv4-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'l3-interface-ipv6-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'l-interface', 'vlan').store('x').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vlan', 'l3-interface-ipv4-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vlan', 'l3-interface-ipv6-address-list').store('x'))),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'generic-vnf', 'lag-interface').createEdgeTraversal(EdgeType.TREE, 'lag-interface', 'l-interface').store('x').createEdgeTraversal(EdgeType.TREE, 'l-interface', 'vlan').union(builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vlan', 'l3-interface-ipv4-address-list').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.TREE, 'vlan', 'l3-interface-ipv6-address-list').store('x')),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'vnf-image').store('x'),builder.newInstance().createEdgeTraversal(EdgeType.COUSIN, 'generic-vnf', 'network-profile').store('x')).cap('x').unfold().dedup()"
+    }
+  }]
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
new file mode 100644
index 0000000..2ff66f8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/closed-loop-named-query-1.0.json
@@ -0,0 +1,78 @@
+{
+   "named-query-uuid" : "4ff56a54-9e3f-46b7-a337-07a1d3c6b469",
+   "named-query-name" : "closed-loop-named-query",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - For closed loop flow",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getClfiRoadmTailSummary-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getClfiRoadmTailSummary-1.0.json
new file mode 100644
index 0000000..a30e797
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getClfiRoadmTailSummary-1.0.json
@@ -0,0 +1,94 @@
+{
+   "named-query-uuid" : "4f448e43-339f-4c1c-85f6-896c444e25ca",
+   "named-query-name" : "GetClfiRoadmTailSummary",
+   "named-query-version" : "1.0",
+   "description" : "Named query - Get CLFI ROADM Tail Summary",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "862b25a1-262a-4961-bdaa-cdc55d69785a"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComplexByPnfName-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComplexByPnfName-1.0.json
new file mode 100644
index 0000000..fef6c91
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComplexByPnfName-1.0.json
@@ -0,0 +1,32 @@
+{
+   "named-query-uuid" : "d27ccfea-7098-42d7-a4cd-bbddb37bf205",
+   "named-query-name" : "getComplexByPnfName",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get complex by pnfName",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "862b25a1-262a-4961-bdaa-cdc55d69785a"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.0.json
new file mode 100644
index 0000000..d3e307c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.0.json
@@ -0,0 +1,98 @@
+{
+   "named-query-uuid" : "ed0a0f5b-cf79-4784-88b2-911cd726cd3d",
+   "named-query-name" : "get-component-list",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - Get Component List",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.1.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.1.json
new file mode 100644
index 0000000..f275950
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.1.json
@@ -0,0 +1,135 @@
+{
+   "named-query-uuid" : "0367193e-c785-4d5f-9cb8-7bc89dc9ddb7",
+   "named-query-name" : "get-component-list",
+   "named-query-version" : "1.1",
+   "description" : "Named Query - Get Component List",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "service-instance-name" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "166c050d-f69d-4305-943e-0bc58c3a26cf"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "1b2c9ba7-e449-4831-ba15-3073672f5ef2"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "1b2c9ba7-e449-4831-ba15-3073672f5ef2"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.2.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.2.json
new file mode 100644
index 0000000..22ba4c0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getComponentList-1.2.json
@@ -0,0 +1,139 @@
+{
+   "named-query-uuid" : "2a183f99-2c66-482b-ade5-7962efd801ef",
+   "named-query-name" : "get-component-list",
+   "named-query-version" : "1.2",
+   "description" : "Named Query - Get Component List",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "service-instance-name" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "1b2c9ba7-e449-4831-ba15-3073672f5ef2"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "do-not-output" : "true",
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "fcec1b02-b2d0-4834-aef8-d71be04717dd"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "1b2c9ba7-e449-4831-ba15-3073672f5ef2"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexHostname-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexHostname-1.0.json
new file mode 100644
index 0000000..a610aa6
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexHostname-1.0.json
@@ -0,0 +1,32 @@
+{
+   "named-query-uuid" : "670a94e9-874f-4087-8501-62d4d289c519",
+   "named-query-name" : "dhv-complex-by-hostname",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - DHV Complex By Hostname",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexLocationId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexLocationId-1.0.json
new file mode 100644
index 0000000..70d6db1
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVComplexLocationId-1.0.json
@@ -0,0 +1,32 @@
+{
+   "named-query-uuid" : "59490c32-eaae-488d-8442-f301b1ed43a9",
+   "named-query-name" : "dhv-complex-by-location-id",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - DHV Complex By LocationId",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLink-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLink-1.0.json
new file mode 100644
index 0000000..6e90b61
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLink-1.0.json
@@ -0,0 +1,58 @@
+{
+   "named-query-uuid" : "47e5e7c7-719e-45af-b96f-0c15fa0691b9",
+   "named-query-name" : "logical-link-by-vnf-name",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get logical-link by vnf-name",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLinkByCircuitId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLinkByCircuitId-1.0.json
new file mode 100644
index 0000000..62de1b8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVLogicalLinkByCircuitId-1.0.json
@@ -0,0 +1,19 @@
+{
+   "named-query-uuid" : "4028faed-b7d5-4059-9d49-7df06da9ebfb",
+   "named-query-name" : "logical-link-by-circuit-id-",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get logical-link by circuit-id",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.0.json
new file mode 100644
index 0000000..a0ba2fe
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.0.json
@@ -0,0 +1,273 @@
+{
+   "named-query-uuid" : "b546a34b-7e71-45dc-9907-4cbdcf675c64",
+   "named-query-name" : "dhv-service-topology",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - DHV Service Topology",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "persona-model-id", "service-instance-name", "service-instance-location-id" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "property-collect-list" : [ "service-type", "temp-ub-sub-account-id" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "global-customer-id" ],
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                     } ]
+                  } ]
+               }
+            }, {
+               "property-collect-list" : [ "service-instance-id", "persona-model-id", "service-instance-name", "service-instance-location-id" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "vnf-name", "vnf-id", "vnf-type", "prov-status", "operational-state" ],
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "property-collect-list" : [ "interface-name" ],
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "property-collect-list" : [ "vlan-interface", "vlan-id-inner", "vlan-id-outer", "vlan-description", "speed-value", "speed-units" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "property-collect-list" : [ "vserver-name", "vserver-id", "prov-status" ],
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "property-collect-list" : [ "interface-name" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "vlan-interface", "vlan-id-inner", "vlan-id-outer", "vlan-description", "speed-value", "speed-units" ],
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                                   } ]
+                                                } ]
+                                             }
+                                          }, {
+                                             "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "hostname" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "interface-name" ],
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "property-collect-list" : [ "service-provider-name" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "c822d81f-822f-4304-9623-1025b53da568"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.1.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.1.json
new file mode 100644
index 0000000..2512590
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology-1.1.json
@@ -0,0 +1,273 @@
+{
+   "named-query-uuid" : "888d6065-e1ff-409c-ac6b-baafc4777788",
+   "named-query-name" : "dhv-service-topology",
+   "named-query-version" : "1.1",
+   "description" : "Named Query - DHV Service Topology",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "model-invariant-id", "service-instance-name", "service-instance-location-id" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "property-collect-list" : [ "service-type", "temp-ub-sub-account-id" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "global-customer-id" ],
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                     } ]
+                  } ]
+               }
+            }, {
+               "property-collect-list" : [ "service-instance-id", "persona-model-id", "service-instance-name", "service-instance-location-id" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "vnf-name", "vnf-id", "vnf-type", "prov-status", "operational-state" ],
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "property-collect-list" : [ "interface-name" ],
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "property-collect-list" : [ "vlan-interface", "vlan-id-inner", "vlan-id-outer", "vlan-description", "speed-value", "speed-units" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "property-collect-list" : [ "vserver-name", "vserver-id", "prov-status" ],
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "property-collect-list" : [ "interface-name" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "vlan-interface", "vlan-id-inner", "vlan-id-outer", "vlan-description", "speed-value", "speed-units" ],
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                                   } ]
+                                                } ]
+                                             }
+                                          }, {
+                                             "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv4-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "property-collect-list" : [ "l3-interface-ipv6-address" ],
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "property-collect-list" : [ "hostname" ],
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "property-collect-list" : [ "interface-name" ],
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "property-collect-list" : [ "service-provider-name" ],
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "c822d81f-822f-4304-9623-1025b53da568"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology2-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology2-1.0.json
new file mode 100644
index 0000000..986c50a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getDHVServiceTopology2-1.0.json
@@ -0,0 +1,321 @@
+{
+   "named-query-uuid" : "09236f18-a9d2-4468-9086-464b8385b706",
+   "named-query-name" : "dhv-service-topology-2",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - DHV Service Topology 2",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                             } ]
+                                          } ]
+                                       }
+                                    }, {
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                                   } ]
+                                                } ]
+                                             }
+                                          }, {
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                       } ]
+                                    } ]
+                                 }
+                              }, {
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                                   } ]
+                                                } ]
+                                             }
+                                          }, {
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                                   } ]
+                                                } ]
+                                             }
+                                          }, {
+                                             "named-query-elements" : {
+                                                "named-query-element" : [ {
+                                                   "relationship-list" : {
+                                                      "relationship" : [ {
+                                                         "related-to" : "model",
+                                                         "relationship-data" : [ {
+                                                            "relationship-key" : "model.model-invariant-id",
+                                                            "relationship-value" : "aad85df2-09be-40fa-b867-16415e4e10e2"
+                                                         } ]
+                                                      } ]
+                                                   }
+                                                }, {
+                                                   "relationship-list" : {
+                                                      "relationship" : [ {
+                                                         "related-to" : "model",
+                                                         "relationship-data" : [ {
+                                                            "relationship-key" : "model.model-invariant-id",
+                                                            "relationship-value" : "82966045-43ee-4982-8307-7e9610866140"
+                                                         } ]
+                                                      } ]
+                                                   }
+                                                } ]
+                                             },
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "f6d6a23d-a1a9-48ff-8419-b6530da2d381"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getL3networkCloudRegionByNetworkRole-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getL3networkCloudRegionByNetworkRole-1.0.json
new file mode 100644
index 0000000..d6b3c34
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getL3networkCloudRegionByNetworkRole-1.0.json
@@ -0,0 +1,71 @@
+{
+   "named-query-uuid" : "96e54642-c0e1-4aa2-af53-e37c623b8d01",
+   "named-query-name" : "l3network-cloud-region-by-network-role",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get l3Network and cloudRegion by networkRole",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getLogicalLinkByCloudRegionId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getLogicalLinkByCloudRegionId-1.0.json
new file mode 100644
index 0000000..e987d36
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getLogicalLinkByCloudRegionId-1.0.json
@@ -0,0 +1,32 @@
+{
+   "named-query-uuid" : "25096aa7-bc97-4ece-8a81-41dd28cd0f7d",
+   "named-query-name" : "getLogicalLinkByCloudRegionId",
+   "named-query-version" : "1.0",
+   "description" : "Named query - get logical link by cloud region id",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getPinterfacePhysicalLinkBySvcInstId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getPinterfacePhysicalLinkBySvcInstId-1.0.json
new file mode 100644
index 0000000..e8b377b
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getPinterfacePhysicalLinkBySvcInstId-1.0.json
@@ -0,0 +1,84 @@
+{
+   "named-query-uuid" : "75d55786-200b-49fd-92d7-1393e755d693",
+   "named-query-name" : "pinterface-physical-link-by-service-instance-id",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get pInterface and physicalLink by serviceInstanceId",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "c822d81f-822f-4304-9623-1025b53da568"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getRouterRoadmTailSummary-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getRouterRoadmTailSummary-1.0.json
new file mode 100644
index 0000000..6f775e8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getRouterRoadmTailSummary-1.0.json
@@ -0,0 +1,120 @@
+{
+   "named-query-uuid" : "cbf22b8a-f29a-4b9b-a466-a878095b258a",
+   "named-query-name" : "GetRouterRoadmTailSummary",
+   "named-query-version" : "1.0",
+   "description" : "Named query - Get Router ROADM Tail Summary",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "862b25a1-262a-4961-bdaa-cdc55d69785a"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                                 } ]
+                              } ]
+                           }
+                        }, {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "named-query-elements" : {
+                                          "named-query-element" : [ {
+                                             "relationship-list" : {
+                                                "relationship" : [ {
+                                                   "related-to" : "model",
+                                                   "relationship-data" : [ {
+                                                      "relationship-key" : "model.model-invariant-id",
+                                                      "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                                                   } ]
+                                                } ]
+                                             }
+                                          } ]
+                                       },
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "94043c37-4e73-439c-a790-0fdd697924cd"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "862b25a1-262a-4961-bdaa-cdc55d69785a"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json
new file mode 100644
index 0000000..035dc8c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceModel-1.0.json
@@ -0,0 +1,93 @@
+{
+   "named-query-uuid" : "3fb4d3d3-36c1-4162-9fe9-3e2c68a9da81",
+   "named-query-name" : "getServiceInstanceModel-1.0",
+   "named-query-version" : "1.0",
+   "description" : "Named query - Get service instance model",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "related-lookups" : {
+                        "related-lookup" : [ {
+                           "source-node-type" : "vf-module",
+                           "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" : "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-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "related-lookups" : {
+                  "related-lookup" : [ {
+                     "source-node-type" : "generic-vnf",
+                     "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" : "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-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "related-lookups" : {
+            "related-lookup" : [ {
+               "source-node-type" : "service-instance",
+               "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-invariant-id",
+               "property-collect-list" : [ "model-name", "model-version-id", "model-version" ]
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceSummary-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceSummary-1.0.json
new file mode 100644
index 0000000..971b1a2
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getServiceInstanceSummary-1.0.json
@@ -0,0 +1,126 @@
+{
+   "named-query-uuid" : "5aaae840-ca96-4e5f-9308-58883564a80f",
+   "named-query-name" : "get-service-instance-summary",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - Get Service Instance Summary",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "service-instance-name", "operational-status" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "do-not-output" : "true",
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "cloud-region-id" ],
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "3d560d81-57d0-438b-a2a1-5334dba0651a"
+                     } ]
+                  } ]
+               }
+            }, {
+               "property-collect-list" : [ "service-type" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "global-customer-id", "subscriber-name" ],
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                     } ]
+                  } ]
+               }
+            }, {
+               "do-not-output" : "true",
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "do-not-output" : "true",
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "do-not-output" : "true",
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "property-collect-list" : [ "cloud-region-id" ],
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getSvcSubscriberModelInfo-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getSvcSubscriberModelInfo-1.0.json
new file mode 100644
index 0000000..5dcd475
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getSvcSubscriberModelInfo-1.0.json
@@ -0,0 +1,46 @@
+{
+   "named-query-uuid" : "6e806bc2-8f9b-4534-bb68-be91267ff6c8",
+   "named-query-name" : "get-service-instance-model-info",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - Get Service Instance Model Info",
+    "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "do-not-output" : "false",
+               "related-lookups" : {
+                  "related-lookup" : [ {
+                     "source-node-type" : "service-instance",
+                     "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", "model-description" ]
+                  }, {
+                     "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-version-id", "model-name", "model-version", "model-description" ]
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcInstance-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcInstance-1.0.json
new file mode 100644
index 0000000..ee1bec5
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcInstance-1.0.json
@@ -0,0 +1,87 @@
+{
+   "named-query-uuid" : "3c167fdb-5a99-46a3-8165-e566d289358d",
+   "named-query-name" : "getTenantInfoAtSvcInstance",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - Tenant Info At Service Instance",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "property-collect-list" : [ "service-instance-id", "service-instance-name" ],
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "property-collect-list" : [ "vnf-id", "vnf-name" ],
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "property-collect-list" : [ "vserver-id", "vserver-name" ],
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "named-query-elements" : {
+                                    "named-query-element" : [ {
+                                       "relationship-list" : {
+                                          "relationship" : [ {
+                                             "related-to" : "model",
+                                             "relationship-data" : [ {
+                                                "relationship-key" : "model.model-invariant-id",
+                                                "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+                                             } ]
+                                          } ]
+                                       }
+                                    } ]
+                                 },
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcSubscription-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcSubscription-1.0.json
new file mode 100644
index 0000000..e520585
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getTenantInfoAtSvcSubscription-1.0.json
@@ -0,0 +1,58 @@
+{
+   "named-query-uuid" : "35b13965-ef9d-4597-9859-bde64c521c91",
+   "named-query-name" : "getTenantInfoAtSvcSubscription",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - Tenant Info At ServiceSubscription",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "af91c2f7-35fc-43cf-a13d-443f385b2353"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVnfVlanByCircuitId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVnfVlanByCircuitId-1.0.json
new file mode 100644
index 0000000..2260ab3
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVnfVlanByCircuitId-1.0.json
@@ -0,0 +1,58 @@
+{
+   "named-query-uuid" : "9abb2661-d92c-4f84-aea6-b16acfa00e22",
+   "named-query-name" : "generic-vnf-vlan-by-circuit-id",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - get genericVnf and vlan by circuitId",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "cea0a982-8d55-4093-921e-418fbccf7060"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVserver-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVserver-1.0.json
new file mode 100644
index 0000000..2107523
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getVserver-1.0.json
@@ -0,0 +1,126 @@
+{
+   "named-query-uuid" : "f199cb88-5e69-4b1f-93e0-6f257877d066",
+   "named-query-name" : "getVserver-1.0",
+   "named-query-version" : "1.0",
+   "description" : "Named query - Get vserver",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                     } ]
+                  } ]
+               }
+            }, {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "related-lookups" : {
+                        "related-lookup" : [ {
+                           "source-node-type" : "vf-module",
+                           "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" : "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-invariant-id",
+                              "relationship-value" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "related-lookups" : {
+                        "related-lookup" : [ {
+                           "source-node-type" : "service-instance",
+                           "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-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-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "related-lookups" : {
+                  "related-lookup" : [ {
+                     "source-node-type" : "generic-vnf",
+                     "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" : "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-invariant-id",
+                        "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getWlBundleId-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getWlBundleId-1.0.json
new file mode 100644
index 0000000..203aa38
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/getWlBundleId-1.0.json
@@ -0,0 +1,81 @@
+{
+   "named-query-uuid" : "88aae9bc-9b3d-44c8-a0ba-3c4911da755c",
+   "named-query-name" : "GetWlBundleId",
+   "named-query-version" : "1.0",
+   "description" : "Named query for wavelength services with same Bundle Id",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "2e1a602a-acd8-4f78-94ff-618b802a303b"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                           } ]
+                        } ]
+                     }
+                  }, {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "fe012535-2c31-4a39-a739-612374c638a0"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "86ffe6e5-4d0e-4cec-80b5-5c38aa3eff98"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json
new file mode 100644
index 0000000..c371796
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-esr-system-info-1.0.json
@@ -0,0 +1,71 @@
+{
+   "named-query-uuid" : "037eb932-edac-48f5-9782-c19c0aa5a031",
+   "named-query-name" : "vnf-to-esr-system-info",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - VNF to ESR System Info",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "named-query-elements" : {
+                        "named-query-element" : [ {
+                           "named-query-elements" : {
+                              "named-query-element" : [ {
+                                 "relationship-list" : {
+                                    "relationship" : [ {
+                                       "related-to" : "model",
+                                       "relationship-data" : [ {
+                                          "relationship-key" : "model.model-invariant-id",
+                                          "relationship-value" : "0562518b-e5b3-49f4-8ad8-19b43766c79d"
+                                       } ]
+                                    } ]
+                                 }
+                              } ]
+                           },
+                           "relationship-list" : {
+                              "relationship" : [ {
+                                 "related-to" : "model",
+                                 "relationship-data" : [ {
+                                    "relationship-key" : "model.model-invariant-id",
+                                    "relationship-value" : "425b2158-e51d-4509-9945-dad4556474a3"
+                                 } ]
+                              } ]
+                           }
+                        } ]
+                     },
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-service-instance-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-service-instance-1.0.json
new file mode 100644
index 0000000..53e6f26
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/named-query-json/vnf-to-service-instance-1.0.json
@@ -0,0 +1,45 @@
+{
+   "named-query-uuid" : "a93ac487-409c-4e8c-9e5f-334ae8f99087",
+   "named-query-name" : "vnf-to-service-instance",
+   "named-query-version" : "1.0",
+   "description" : "Named Query - VNF to Service Instance",
+   "named-query-elements" : {
+      "named-query-element" : [ {
+         "named-query-elements" : {
+            "named-query-element" : [ {
+               "named-query-elements" : {
+                  "named-query-element" : [ {
+                     "relationship-list" : {
+                        "relationship" : [ {
+                           "related-to" : "model",
+                           "relationship-data" : [ {
+                              "relationship-key" : "model.model-invariant-id",
+                              "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+                           } ]
+                        } ]
+                     }
+                  } ]
+               },
+               "relationship-list" : {
+                  "relationship" : [ {
+                     "related-to" : "model",
+                     "relationship-data" : [ {
+                        "relationship-key" : "model.model-invariant-id",
+                        "relationship-value" : "82194af1-3c2c-485a-8f44-420e22a9eaa4"
+                     } ]
+                  } ]
+               }
+            } ]
+         },
+         "relationship-list" : {
+            "relationship" : [ {
+               "related-to" : "model",
+               "relationship-data" : [ {
+                  "relationship-key" : "model.model-invariant-id",
+                  "relationship-value" : "acc6edd8-a8d4-4b93-afaa-0994068be14c"
+               } ]
+            } ]
+         }
+      } ]
+   }
+}
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/resource-model-json/000-README b/aai-traversal/src/main/resources/etc/scriptdata/resource-model-json/000-README
new file mode 100644
index 0000000..9647972
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/resource-model-json/000-README
@@ -0,0 +1,10 @@
+Add resource models here in the order you want them to be added to the graph.
+
+Recommended that they are spaced by 10's.
+
+So, if you are adding a resource model it should be:
+
+100-ipe-resource-model-1.0.json
+110-vBgf-resource-model-1.0.json
+
+This will allow others to insert models between existing models.
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/service-model-json/000-README b/aai-traversal/src/main/resources/etc/scriptdata/service-model-json/000-README
new file mode 100644
index 0000000..bb30e02
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/service-model-json/000-README
@@ -0,0 +1,10 @@
+Add service models here in the order you want them to be added to the graph.
+
+Recommended that they are spaced by 10's.
+
+So, if you are adding a resource model it should be:
+
+100-connector-service-model-1.0.json
+110-service-instance-service-model-1.0.json
+
+This will allow others to insert models between existing models.
+\ No newline at end of file
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-1.0.json
new file mode 100644
index 0000000..9d3e00c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "af593b4b-490e-4665-ad74-2f6351c0a7ce",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "fd7fb09e-d930-41b9-b83f-cfde9df48640",
+			"model-version" : "1.0",
+			"model-name" : "action"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-data-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-data-1.0.json
new file mode 100644
index 0000000..7229f5a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/action-data-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "9551346c-7d8b-4daf-9926-b93e96e2344a",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+			"model-version" : "1.0",
+			"model-name" : "action-data"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/allotted-resource-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/allotted-resource-1.0.json
new file mode 100644
index 0000000..9329af8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/allotted-resource-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "f6d6a23d-a1a9-48ff-8419-b6530da2d381",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "7ad0915f-25c0-4a70-b9bc-185a75f87564",
+			"model-version" : "1.0",
+			"model-name" : "allotted-resource"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/availability-zone-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/availability-zone-1.0.json
new file mode 100644
index 0000000..0c423fe
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/availability-zone-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "61b88c01-d819-41c0-8e21-7fd7ba47148e",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "6c092fb1-21b2-456b-9e01-67fb4de1896e",
+			"model-version" : "1.0",
+			"model-name" : "availability-zone"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/az-and-dvs-switches-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/az-and-dvs-switches-1.0.json
new file mode 100644
index 0000000..620a33d
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/az-and-dvs-switches-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "53dc00d4-e6d9-48ec-b6cc-3d3797e9b896",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "b2dea88d-78a0-49bf-95c9-5819df08e966",
+			"model-version" : "1.0",
+			"model-name" : "az-and-dvs-switches"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/class-of-service-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/class-of-service-1.0.json
new file mode 100644
index 0000000..2b28152
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/class-of-service-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "18094b19-d16d-4822-8acf-e92c6aefa178",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d2fb27cc-15eb-4c4e-828e-71d41aaecc5b",
+			"model-version" : "1.0",
+			"model-name" : "class-of-service"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cloud-region-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cloud-region-1.0.json
new file mode 100644
index 0000000..a2957c4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cloud-region-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "425b2158-e51d-4509-9945-dad4556474a3",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "2a160989-b202-47dd-874b-4a0f275998f7",
+			"model-version" : "1.0",
+			"model-name" : "cloud-region"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/complex-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/complex-1.0.json
new file mode 100644
index 0000000..c8ca766
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/complex-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "af91c2f7-35fc-43cf-a13d-443f385b2353",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "3a8ab1ee-9220-4fe8-b89c-9251d160ddc2",
+			"model-version" : "1.0",
+			"model-name" : "complex"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/configuration-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/configuration-1.0.json
new file mode 100644
index 0000000..939f175
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/configuration-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "166c050d-f69d-4305-943e-0bc58c3a26cf",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5a175add-57e4-4a5d-8b02-c36f1d69c52b",
+			"model-version" : "1.0",
+			"model-name" : "configuration"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/connector-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/connector-1.0.json
new file mode 100644
index 0000000..f9bfed0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/connector-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "4c01c948-7607-4d66-8a6c-99c2c2717936",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "22104c9f-29fd-462f-be07-96cd6b46dd33",
+			"model-version" : "1.0",
+			"model-name" : "connector"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/constrained-element-set-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/constrained-element-set-1.0.json
new file mode 100644
index 0000000..44f5de2
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/constrained-element-set-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "c0292b4f-ee97-40cc-8c2e-f967c48f5701",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "01102126-9c04-4a89-945b-b131e61e95d7",
+			"model-version" : "1.0",
+			"model-name" : "constrained-element-set"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-assignment-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-assignment-1.0.json
new file mode 100644
index 0000000..87eee5c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-assignment-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "fcb8d46b-b656-4ad6-8fa4-22cef74b443f",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "44e5cb1f-0938-41aa-b766-d4595109fe89",
+			"model-version" : "1.0",
+			"model-name" : "ctag-assignment"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-pool-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-pool-1.0.json
new file mode 100644
index 0000000..c85e267
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ctag-pool-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "46c51d4e-d67e-4a9c-b1f5-49b1e9c6fcaa",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "2056c41f-23b9-4de7-9f50-819adad37d76",
+			"model-version" : "1.0",
+			"model-name" : "ctag-pool"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/customer-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/customer-1.0.json
new file mode 100644
index 0000000..35cf683
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/customer-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "c1d4305f-cdbd-4bbe-9069-a2f4978fd89e",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d4df5c27-98a1-4812-a8aa-c17f055b7a3f",
+			"model-version" : "1.0",
+			"model-name" : "customer"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cvlan-tag-entry-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cvlan-tag-entry-1.0.json
new file mode 100644
index 0000000..95211f2
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/cvlan-tag-entry-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "245cf4b0-7cc5-4eea-bbd9-753e939adcab",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c3878ffb-8d85-4114-bee6-e4074a9db10b",
+			"model-version" : "1.0",
+			"model-name" : "cvlan-tag-entry"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/dvs-switch-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/dvs-switch-1.0.json
new file mode 100644
index 0000000..22dc769
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/dvs-switch-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "98fbb471-1f86-428e-bd8a-c8a25de6fa23",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "4cb44ae8-e3ab-452a-9f95-bcc8a44c55ea",
+			"model-version" : "1.0",
+			"model-name" : "dvs-switch"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/edge-prop-names-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/edge-prop-names-1.0.json
new file mode 100644
index 0000000..4ed663f
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/edge-prop-names-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "7a08cad4-8759-46a5-8245-095d1ba57ac6",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f0442326-8201-4d0e-857c-74b4ddcbfc9f",
+			"model-version" : "1.0",
+			"model-name" : "edge-prop-names"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/element-choice-set-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/element-choice-set-1.0.json
new file mode 100644
index 0000000..46c7348
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/element-choice-set-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "9a011958-7165-47a3-b872-00951d1f09ae",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "af27fbfd-598d-44da-aeae-0f9d3a5fcd6a",
+			"model-version" : "1.0",
+			"model-name" : "element-choice-set"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/entitlement-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/entitlement-1.0.json
new file mode 100644
index 0000000..b6bf0e8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/entitlement-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ae75b5a0-d5e1-4f3a-b8fb-37626a753da3",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "7e27ba2e-b7db-4e13-9fae-d142152ef98a",
+			"model-version" : "1.0",
+			"model-name" : "entitlement"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/esr-system-info-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/esr-system-info-1.0.json
new file mode 100644
index 0000000..54a3bc8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/esr-system-info-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "0562518b-e5b3-49f4-8ad8-19b43766c79d",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5ded840b-42aa-4692-a7ac-9a6ed5f3146b",
+			"model-version" : "1.0",
+			"model-name" : "esr-system-info"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/flavor-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/flavor-1.0.json
new file mode 100644
index 0000000..c44e554
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/flavor-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "bace8d1c-a261-4041-9e37-823117415d0f",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "36200fb5-f251-4f5d-a520-7c5ad5c2cd4b",
+			"model-version" : "1.0",
+			"model-name" : "flavor"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/generic-vnf-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/generic-vnf-1.0.json
new file mode 100644
index 0000000..afab83a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/generic-vnf-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "acc6edd8-a8d4-4b93-afaa-0994068be14c",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "93a6166f-b3d5-4f06-b4ba-aed48d009ad9",
+			"model-version" : "1.0",
+			"model-name" : "generic-vnf"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/group-assignment-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/group-assignment-1.0.json
new file mode 100644
index 0000000..33e1495
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/group-assignment-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "7cc05f25-7ba2-42b7-a237-c5662a1689e1",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "fe578080-ce19-4604-8760-fc264fbb2565",
+			"model-version" : "1.0",
+			"model-name" : "group-assignment"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/image-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/image-1.0.json
new file mode 100644
index 0000000..59f095b
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/image-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "3f4c7204-739b-4bbb-87a7-8a6856439c90",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f6a038c2-820c-42ba-8c2b-375e24e8f932",
+			"model-version" : "1.0",
+			"model-name" : "image"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/include-node-filter-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/include-node-filter-1.0.json
new file mode 100644
index 0000000..83d9255
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/include-node-filter-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "2a2d8ad2-af0a-4e1f-9982-0c899e7dc827",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f05f804d-7057-4ffe-bdc5-39f2f0c9c9fd",
+			"model-version" : "1.0",
+			"model-name" : "include-node-filter"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/instance-group-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/instance-group-1.0.json
new file mode 100644
index 0000000..81eeff0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/instance-group-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "8e6ee9dc-9017-444a-83b3-219edb018128",
+			"model-version" : "1.0",
+			"model-name" : "instance-group"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-1.0.json
new file mode 100644
index 0000000..307d29d
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "cd57d844-9017-4078-aa19-926935a3d77c",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "69957f4a-2155-4b95-8d72-d6dd9b88b27b",
+			"model-version" : "1.0",
+			"model-name" : "inventory-item"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-data-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-data-1.0.json
new file mode 100644
index 0000000..46cb9f0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/inventory-item-data-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "87a383ae-cf03-432e-a9de-04e6a622d0fd",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "0e54bb87-bd6e-4a2b-ad1c-6d935b87ae51",
+			"model-version" : "1.0",
+			"model-name" : "inventory-item-data"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ipsec-configuration-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ipsec-configuration-1.0.json
new file mode 100644
index 0000000..165ebbe
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/ipsec-configuration-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "aca4c310-cb45-42bd-9f88-73e40ba7b962",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d949fd10-36bf-408a-ac7a-cad5004d2e0d",
+			"model-version" : "1.0",
+			"model-name" : "ipsec-configuration"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/key-data-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/key-data-1.0.json
new file mode 100644
index 0000000..f0f7cb4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/key-data-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "f5faa464-c2f2-4cc3-89d2-a90452dc3a07",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c23ea04d-1a3b-453d-bc49-a6c783a5e92b",
+			"model-version" : "1.0",
+			"model-name" : "key-data"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l-interface-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l-interface-1.0.json
new file mode 100644
index 0000000..0f63ba5
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l-interface-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "cea0a982-8d55-4093-921e-418fbccf7060",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "a32613fd-18b9-459e-aab8-fffb3912966a",
+			"model-version" : "1.0",
+			"model-name" : "l-interface"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv4-address-list-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv4-address-list-1.0.json
new file mode 100644
index 0000000..0bb4d41
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv4-address-list-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "aad85df2-09be-40fa-b867-16415e4e10e2",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "41e76b6f-1e06-4fd4-82cd-81c50fc4574b",
+			"model-version" : "1.0",
+			"model-name" : "l3-interface-ipv4-address-list"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv6-address-list-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv6-address-list-1.0.json
new file mode 100644
index 0000000..9a830f4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-interface-ipv6-address-list-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "82966045-43ee-4982-8307-7e9610866140",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d040621d-541a-477b-bb1b-a2b61b14e295",
+			"model-version" : "1.0",
+			"model-name" : "l3-interface-ipv6-address-list"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-network-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-network-1.0.json
new file mode 100644
index 0000000..0d92d38
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/l3-network-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "3d560d81-57d0-438b-a2a1-5334dba0651a",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "9111f20f-e680-4001-b83f-19a2fc23bfc1",
+			"model-version" : "1.0",
+			"model-name" : "l3-network"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-interface-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-interface-1.0.json
new file mode 100644
index 0000000..9bf0715
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-interface-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "e0ee9bde-c1fc-4651-a95d-8e0597bf7d70",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "ce95f7c3-b61b-4758-ae9e-7e943b1c103d",
+			"model-version" : "1.0",
+			"model-name" : "lag-interface"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-link-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-link-1.0.json
new file mode 100644
index 0000000..44046a9
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/lag-link-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "86ffe6e5-4d0e-4cec-80b5-5c38aa3eff98",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d29a087a-af59-4053-a3f8-0f95a92faa75",
+			"model-version" : "1.0",
+			"model-name" : "lag-link"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-1.0.json
new file mode 100644
index 0000000..fc79b60
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "b9a9b337-1f86-42d3-b9f9-f987a089507c",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "6889274b-a1dc-40ab-9090-93677e13e2e6",
+			"model-version" : "1.0",
+			"model-name" : "license"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-key-resource-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-key-resource-1.0.json
new file mode 100644
index 0000000..b56df16
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/license-key-resource-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "9022ebfe-b54f-4911-a6b2-8c3f5ec189b7",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "24b25f8c-b8bd-4c62-9421-87c12667aac9",
+			"model-version" : "1.0",
+			"model-name" : "license-key-resource"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/logical-link-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/logical-link-1.0.json
new file mode 100644
index 0000000..66300e7
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/logical-link-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "fe012535-2c31-4a39-a739-612374c638a0",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "a1481a38-f8ba-4ae4-bdf1-06c2c6af4c54",
+			"model-version" : "1.0",
+			"model-name" : "logical-link"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/metadatum-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/metadatum-1.0.json
new file mode 100644
index 0000000..1110746
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/metadatum-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "86dbb63a-265e-4614-993f-6771c30b56a5",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "6bae950e-8939-41d3-a6a7-251b03e4c1fc",
+			"model-version" : "1.0",
+			"model-name" : "metadatum"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-1.0.json
new file mode 100644
index 0000000..4c5da8c
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "06d1418a-5faa-452d-a94b-a2829df5f67b",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "1f51c05c-b164-4c27-9c03-5cbb239fd6be",
+			"model-version" : "1.0",
+			"model-name" : "model"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-constraint-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-constraint-1.0.json
new file mode 100644
index 0000000..37b7272
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-constraint-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "c28966f3-e758-4483-b37b-a90b05d3dd33",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "ad70dd19-f156-4fb5-a865-97b5563b0d37",
+			"model-version" : "1.0",
+			"model-name" : "model-constraint"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-element-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-element-1.0.json
new file mode 100644
index 0000000..6e4df08
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-element-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "2076e726-3577-477a-a300-7fa65cd4df11",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "753e813a-ba9e-4a1d-ab34-b2f6dc6eec0c",
+			"model-version" : "1.0",
+			"model-name" : "model-element"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-ver-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-ver-1.0.json
new file mode 100644
index 0000000..98511b0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/model-ver-1.0.json
@@ -0,0 +1,11 @@
+{
+   "model-invariant-id" : "b5cd462f-e426-4146-b1fe-5475ae272c3d",
+   "model-type" : "widget",
+   "model-vers" : {
+      "model-ver" : [ {
+         "model-version-id" : "93f2f8bc-cb12-4a01-96c8-3d2649e4ab8f",
+         "model-name" : "model-ver",
+         "model-version" : "1.0"
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/multicast-configuration-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/multicast-configuration-1.0.json
new file mode 100644
index 0000000..c76e423
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/multicast-configuration-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ea78c9e3-514d-4a0a-9162-13837fa54c35",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "666a06ee-4b57-46df-bacf-908da8f10c3f",
+			"model-version" : "1.0",
+			"model-name" : "multicast-configuration"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-1.0.json
new file mode 100644
index 0000000..7aef873
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "80b712fd-0ad3-4180-a99c-8c995cf1cc32",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5c3b7c33-afa3-4be5-8da7-1a5ac6f99896",
+			"model-version" : "1.0",
+			"model-name" : "named-query"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-element-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-element-1.0.json
new file mode 100644
index 0000000..6f6d11a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/named-query-element-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "3c504d40-b847-424c-9d25-4fb7e0a3e994",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "204c641a-3494-48c8-979a-86856f5fd32a",
+			"model-version" : "1.0",
+			"model-name" : "named-query-element"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-policy-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-policy-1.0.json
new file mode 100644
index 0000000..a28b19e
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-policy-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "6aa05779-94d7-4d8b-9bee-59ef2ab0c246",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "a0ccd9dc-7062-4940-9bcc-e91dd28af510",
+			"model-version" : "1.0",
+			"model-name" : "network-policy"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-profile-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-profile-1.0.json
new file mode 100644
index 0000000..30d6d9d
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/network-profile-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "2734b44a-b8a2-40f6-957d-6256589e5d00",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "01f45471-4240-498c-a9e1-235dc0b8b4a6",
+			"model-version" : "1.0",
+			"model-name" : "network-profile"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/newvce-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/newvce-1.0.json
new file mode 100644
index 0000000..b2285d4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/newvce-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "4b05ec9c-c55d-4987-83ff-e08d6ddb694f",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "7c79e11f-a408-4593-aa86-ba948a1236af",
+			"model-version" : "1.0",
+			"model-name" : "newvce"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/oam-network-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/oam-network-1.0.json
new file mode 100644
index 0000000..7a3cd18
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/oam-network-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "2851cf01-9c40-4064-87d4-6184a6fcff35",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f4fb34f3-fd6e-4a8f-a3fb-4ab61a343b79",
+			"model-version" : "1.0",
+			"model-name" : "oam-network"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/p-interface-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/p-interface-1.0.json
new file mode 100644
index 0000000..3d02918
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/p-interface-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "94043c37-4e73-439c-a790-0fdd697924cd",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "d2cdb2d0-fc1f-4a57-a89e-591b1c4e3754",
+			"model-version" : "1.0",
+			"model-name" : "p-interface"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/physical-link-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/physical-link-1.0.json
new file mode 100644
index 0000000..904a4cc
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/physical-link-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "c822d81f-822f-4304-9623-1025b53da568",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "9c523936-95b4-4d7f-9f53-6bdfe0cf2c05",
+			"model-version" : "1.0",
+			"model-name" : "physical-link"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pnf-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pnf-1.0.json
new file mode 100644
index 0000000..9260b17
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pnf-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "862b25a1-262a-4961-bdaa-cdc55d69785a",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "e9f1fa7d-c839-418a-9601-03dc0d2ad687",
+			"model-version" : "1.0",
+			"model-name" : "pnf"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/port-group-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/port-group-1.0.json
new file mode 100644
index 0000000..8aac84d
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/port-group-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "8ce940fb-55d7-4230-9e7f-a56cc2741f77",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "03e8bb6b-b48a-46ae-b5d4-e5af577e6844",
+			"model-version" : "1.0",
+			"model-name" : "port-group"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/property-constraint-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/property-constraint-1.0.json
new file mode 100644
index 0000000..4db5389
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/property-constraint-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "f4a863c3-6886-470a-a6ae-05723837ea45",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "81706bbd-981e-4362-ae20-995cbcb2d995",
+			"model-version" : "1.0",
+			"model-name" : "property-constraint"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pserver-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pserver-1.0.json
new file mode 100644
index 0000000..a22b859
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/pserver-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "6d932c8f-463b-4e76-83fb-87acfbaa2e2d",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "72f0d495-bc27-4653-9e1a-eef76bd34bc9",
+			"model-version" : "1.0",
+			"model-name" : "pserver"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/related-lookup-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/related-lookup-1.0.json
new file mode 100644
index 0000000..e67fa07
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/related-lookup-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "468f6f5b-2996-41bb-b2a3-7cf9613ebb9b",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "0988bab5-bf4f-4938-a419-ab249867d12a",
+			"model-version" : "1.0",
+			"model-name" : "related-lookup"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/reserved-prop-names-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/reserved-prop-names-1.0.json
new file mode 100644
index 0000000..1bfc7d3
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/reserved-prop-names-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "0c3e0ba3-618c-498d-9127-c8d42b00170f",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "ac49d26d-9163-430e-934a-13b738a04f5c",
+			"model-version" : "1.0",
+			"model-name" : "reserved-prop-names"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/result-data-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/result-data-1.0.json
new file mode 100644
index 0000000..059dfb0
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/result-data-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ff656f23-6185-406f-9006-4b26834f3e1c",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "4e9b50aa-5227-4f6f-b489-62e6bbc03c79",
+			"model-version" : "1.0",
+			"model-name" : "result-data"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/route-table-reference-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/route-table-reference-1.0.json
new file mode 100644
index 0000000..f7910a9
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/route-table-reference-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "a8614b63-2636-4c4f-98df-fd448c4241db",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "fed7e326-03a7-45ff-a3f2-471470d268c4",
+			"model-version" : "1.0",
+			"model-name" : "route-table-reference"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/routing-instance-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/routing-instance-1.0.json
new file mode 100644
index 0000000..caec0d6
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/routing-instance-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "1c2ded4f-8b01-4193-829c-966847dfec3e",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "3ccbcbc7-d19e-44d5-a52f-7e18aa8d69fa",
+			"model-version" : "1.0",
+			"model-name" : "routing-instance"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/secondary-filter-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/secondary-filter-1.0.json
new file mode 100644
index 0000000..cef0a94
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/secondary-filter-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "738ff299-6290-4c00-8998-bd0e96a07b93",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "1380619d-dd1a-4cec-b755-c6407833e065",
+			"model-version" : "1.0",
+			"model-name" : "secondary-filter"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/segmentation-assignment-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/segmentation-assignment-1.0.json
new file mode 100644
index 0000000..4335e10
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/segmentation-assignment-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "6e814aee-46e1-4583-a9d4-0049bfd2b59b",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c5171ae0-44fb-4c04-b482-d56702241a44",
+			"model-version" : "1.0",
+			"model-name" : "segmentation-assignment"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-1.0.json
new file mode 100644
index 0000000..ab3295a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "07a3a60b-1b6c-4367-8173-8014386f89e3",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "ecce2c42-3957-4ae0-9442-54bc6afe27b6",
+			"model-version" : "1.0",
+			"model-name" : "service"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-capability-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-capability-1.0.json
new file mode 100644
index 0000000..038a993
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-capability-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "b1a7cc05-d19d-443b-a5d1-733e325c4232",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f9cfec1b-18da-4bba-bd83-4b26cca115cd",
+			"model-version" : "1.0",
+			"model-name" : "service-capability"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-instance-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-instance-1.0.json
new file mode 100644
index 0000000..b5ef861
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-instance-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "82194af1-3c2c-485a-8f44-420e22a9eaa4",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "46b92144-923a-4d20-b85a-3cbd847668a9",
+			"model-version" : "1.0",
+			"model-name" : "service-instance"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-subscription-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-subscription-1.0.json
new file mode 100644
index 0000000..2af765f
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/service-subscription-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "2e1a602a-acd8-4f78-94ff-618b802a303b",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5e68299a-79f2-4bfb-8fbc-2bae877a2459",
+			"model-version" : "1.0",
+			"model-name" : "service-subscription"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-1.0.json
new file mode 100644
index 0000000..eef13ea
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "db63f3e6-f8d1-484e-8d5e-191600b7914b",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "7106bc02-6552-4fc3-8a56-4f3df9034531",
+			"model-version" : "1.0",
+			"model-name" : "site-pair"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-set-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-set-1.0.json
new file mode 100644
index 0000000..3c77903
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/site-pair-set-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "5d4dae3e-b402-4bfd-909e-ece12ff75d26",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "a5c6c1bc-dc38-468e-9459-bb08f87247df",
+			"model-version" : "1.0",
+			"model-name" : "site-pair-set"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/snapshot-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/snapshot-1.0.json
new file mode 100644
index 0000000..24ea90b
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/snapshot-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "24de00ef-aead-4b52-995b-0adf8d4bd90d",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "962a7c8b-687f-4d32-a775-fe098e214bcd",
+			"model-version" : "1.0",
+			"model-name" : "snapshot"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/sriov-vf-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/sriov-vf-1.0.json
new file mode 100644
index 0000000..a5c077a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/sriov-vf-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "04b2935f-33c4-40a9-8af0-8b52690042dc",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "1e8b331f-3d4a-4160-b7aa-f4d5a8916625",
+			"model-version" : "1.0",
+			"model-name" : "sriov-vf"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/start-node-filter-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/start-node-filter-1.0.json
new file mode 100644
index 0000000..743d89e
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/start-node-filter-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "083093a3-e407-447a-ba5d-7583e4d23e1d",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "aad96fd3-e75f-42fc-9777-3450c36f1168",
+			"model-version" : "1.0",
+			"model-name" : "start-node-filter"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/subnet-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/subnet-1.0.json
new file mode 100644
index 0000000..f6b2e55
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/subnet-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "1b2c9ba7-e449-4831-ba15-3073672f5ef2",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "f902a6bc-6be4-4fe5-8458-a6ec0056b374",
+			"model-version" : "1.0",
+			"model-name" : "subnet"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tagged-inventory-item-list-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tagged-inventory-item-list-1.0.json
new file mode 100644
index 0000000..5146b99
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tagged-inventory-item-list-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "e78a7eaa-f65d-4919-9c2b-5b258c8c4d7e",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c246f6e2-e3a1-4697-94c0-5672a7fbbf04",
+			"model-version" : "1.0",
+			"model-name" : "tagged-inventory-item-list"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tenant-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tenant-1.0.json
new file mode 100644
index 0000000..e105783
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tenant-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "97c26c99-6870-44c1-8a07-1d900d3f4ce6",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "abcc54bc-bb74-49dc-9043-7f7171707545",
+			"model-version" : "1.0",
+			"model-name" : "tenant"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tunnel-xconnect-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tunnel-xconnect-1.0.json
new file mode 100644
index 0000000..5c6d5c6
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/tunnel-xconnect-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "50b9e2fa-005c-4bbe-b651-3251dece4cd8",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "e7cb4ca8-e1a5-4487-a716-4ae0bcd8aef5",
+			"model-version" : "1.0",
+			"model-name" : "tunnel-xconnect"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/update-node-key-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/update-node-key-1.0.json
new file mode 100644
index 0000000..25c5efd
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/update-node-key-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "fe81c801-f65d-408a-b2b7-a729a18f8154",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "6004cfa6-eb6d-4062-971f-b1fde6b74aa0",
+			"model-version" : "1.0",
+			"model-name" : "update-node-key"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vce-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vce-1.0.json
new file mode 100644
index 0000000..45f01d4
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vce-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "bab6dceb-e7e6-4301-a5e0-a7399b48d792",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "b6cf54b5-ec45-43e1-be64-97b4e1513333",
+			"model-version" : "1.0",
+			"model-name" : "vce"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vf-module-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vf-module-1.0.json
new file mode 100644
index 0000000..383d187
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vf-module-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ef86f9c5-2165-44f3-8fc3-96018b609ea5",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c00563ae-812b-4e62-8330-7c4d0f47088a",
+			"model-version" : "1.0",
+			"model-name" : "vf-module"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vig-server-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vig-server-1.0.json
new file mode 100644
index 0000000..6fd8d24
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vig-server-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "bed7c3b7-35d0-4cd9-abde-41b20e68b28e",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "8e8c22f1-fbdf-48ea-844c-8bdeb44e7b16",
+			"model-version" : "1.0",
+			"model-name" : "vig-server"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/virtual-data-center-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/virtual-data-center-1.0.json
new file mode 100644
index 0000000..a36361e
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/virtual-data-center-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "5150abcf-0c5f-4593-9afe-a19c48fc4824",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "6dd43ced-d789-47af-a759-d3abc14e3ac1",
+			"model-version" : "1.0",
+			"model-name" : "virtual-data-center"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vlan-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vlan-1.0.json
new file mode 100644
index 0000000..64608f8
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vlan-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "d2b1eaf1-ae59-4116-9ee4-aa0179faa4f8",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "257d88a5-a269-4c35-944f-aca04fbdb791",
+			"model-version" : "1.0",
+			"model-name" : "vlan"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnf-image-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnf-image-1.0.json
new file mode 100644
index 0000000..1756e38
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnf-image-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "f9a628ff-7aa0-40e2-a93d-02d91c950982",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "c4d3e747-ba4a-4b17-9896-94c6f18c19d3",
+			"model-version" : "1.0",
+			"model-name" : "vnf-image"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnfc-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnfc-1.0.json
new file mode 100644
index 0000000..8c663a7
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vnfc-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "96129eb9-f0de-4e05-8af2-73146473f766",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "5761e0a7-c6df-4d8a-9ebd-b8f445054dec",
+			"model-version" : "1.0",
+			"model-name" : "vnfc"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-1.0.json
new file mode 100644
index 0000000..dd5d239
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ddd739b4-2b25-46c4-affc-41a32af5cc42",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "0fbe2e8f-4d91-4415-a772-88387049b38d",
+			"model-version" : "1.0",
+			"model-name" : "volume"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-group-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-group-1.0.json
new file mode 100644
index 0000000..4ccde3a
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/volume-group-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "fcec1b02-b2d0-4834-aef8-d71be04717dd",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "99d44c90-1f61-4418-b9a6-56586bf38c79",
+			"model-version" : "1.0",
+			"model-name" : "volume-group"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpe-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpe-1.0.json
new file mode 100644
index 0000000..ed5017e
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpe-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "053ec3a7-5b72-492d-b54d-123805a9b967",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "203817d3-829c-42d4-942d-2a935478e993",
+			"model-version" : "1.0",
+			"model-name" : "vpe"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpls-pe-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpls-pe-1.0.json
new file mode 100644
index 0000000..0d072bc
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpls-pe-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "457ba89b-334c-4fbd-acc4-160ac0e0cdc0",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "b1566228-6785-4ce1-aea2-053736f80341",
+			"model-version" : "1.0",
+			"model-name" : "vpls-pe"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpn-binding-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpn-binding-1.0.json
new file mode 100644
index 0000000..e0439b6
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vpn-binding-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "9e23b675-db2b-488b-b459-57aa9857baa0",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "21a146e5-9901-448c-9197-723076770119",
+			"model-version" : "1.0",
+			"model-name" : "vpn-binding"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vserver-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vserver-1.0.json
new file mode 100644
index 0000000..a069209
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/vserver-1.0.json
@@ -0,0 +1,11 @@
+{
+	"model-invariant-id" : "ff69d4e0-a8e8-4108-bdb0-dd63217e63c7",
+	"model-type" : "widget",
+	"model-vers" : {
+		"model-ver" : [ {
+			"model-version-id" : "8ecb2c5d-7176-4317-a255-26274edfdd53",
+			"model-version" : "1.0",
+			"model-name" : "vserver"
+		} ]
+	}
+}
diff --git a/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/zone-1.0.json b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/zone-1.0.json
new file mode 100644
index 0000000..8427ded
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/scriptdata/widget-model-json/zone-1.0.json
@@ -0,0 +1,11 @@
+{
+   "model-invariant-id" : "16f7cb93-e807-4065-816b-9cdf391d4992",
+   "model-type" : "widget",
+   "model-vers" : {
+      "model-ver" : [ {
+         "model-version-id" : "f7f21a66-4714-431c-af17-52d64e21de95",
+         "model-name" : "zone",
+         "model-version" : "1.0"
+      } ]
+   }
+}
diff --git a/aai-traversal/src/main/resources/etc/sysprops/sys-props.properties b/aai-traversal/src/main/resources/etc/sysprops/sys-props.properties
new file mode 100644
index 0000000..44d58d5
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/sysprops/sys-props.properties
@@ -0,0 +1,140 @@
+#This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly.
+#The sys-props.properties file is used for running locally. The template.sys-props.properties file will be used when deployed
+#to a SOA/CSI Cloud node.
+
+#AJSC System Properties. The following properties are required for ALL AJSC services. If you are adding System Properties for your
+#particular service, please add them AFTER all AJSC related System Properties. 
+
+#For Cadi Authorization, use value="authentication-scheme-1
+CadiAuthN=authentication-scheme-1
+
+#For Basic Authorization, use value="authentication-scheme-1
+authN=authentication-scheme-2
+
+#Persistence used for AJSC meta-data storage. For most environments, "file" should be used.
+ajscPersistence=file
+
+# If using hawtio for local development, these properties will allow for faster server startup and usage for local development
+hawtio.authenticationEnabled=false
+hawtio.config.pullOnStartup=false
+
+#Removes the extraneous restlet console output
+org.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade
+
+#server.host property to be enabled for local DME2 related testing
+#server.host=<Your network IP address> 
+
+#Enable/disable SSL (values=true/false). This property also determines which protocol to use (https if true, http otherwise), to register services into GRM through DME2.
+enableSSL=false
+
+#Enable/disable csi logging (values=true/false). This can be disabled during local development
+csiEnable=false
+
+#Enable/disable EJB Container
+ENABLE_EJB=false
+
+#Enable/disable OSGI
+isOSGIEnable=false
+
+#Configure JMS Queue (WMQ/TIBCO)
+JMS_BROKER=WMQ
+
+#JMS properties needed for CSI Logging
+JMS_TIBCO_PROVIDER_URL=ONAPserverTBD
+JMS_LOGGER_USER_NAME=spm2
+JMS_LOGGER_PASSWORD=its4test
+JMS_LOGGER_AUDIT_QUEUE_BINDING=pub.m2e.audit.logger.queue
+JMS_LOGGER_PERF_QUEUE_BINDING=log.csi.performance02
+
+#WMQ connectivity
+JMS_WMQ_PROVIDER_URL=aftdsc://AFTUAT/34.07/-84.28
+JMS_WMQ_CONNECTION_FACTORY_NAME=aftdsc://AFTUAT/?service=CSILOG,version=1.0,bindingType=fusionBus,envContext=Q,Q25A=YES
+JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME=com.att.aft.jms.FusionCtxFactory
+JMS_WMQ_AUDIT_DESTINATION_NAME=queue:///CSILOGQL.M2E.DASHBOARD01.NOT.Q25A
+JMS_WMQ_PERF_DESTINATION_NAME=queue:///CSILOGQL.M2E.PERFORMANCE01.NOT.Q25A
+
+
+#CSI related variables for CSM framework
+csm.hostname=d1a-m2e-q112m2e1.edc.cingular.net
+
+#Enable/disable endpoint level logging (values=true/false). This can be disabled during local development
+endpointLogging=false
+
+#SOA_CLOUD_ENV is used to register your service with dme2 and can be turned off for local development (values=true/false).
+SOA_CLOUD_ENV=false
+
+#CONTINUE_ON_LISTENER_EXCEPTION will exit the application if there is a DME2 exception at the time of registration.
+CONTINUE_ON_LISTENER_EXCEPTION=false
+
+#Jetty Container ThreadCount Configuration Variables
+AJSC_JETTY_ThreadCount_MIN=10
+AJSC_JETTY_ThreadCount_MAX=500
+AJSC_JETTY_IDLETIME_MAX=60000
+AJSC_JETTY_BLOCKING_QUEUE_SIZE=100
+
+#Camel Context level default threadPool Profile configuration
+CAMEL_POOL_SIZE=10
+CAMEL_MAX_POOL_SIZE=20
+CAMEL_KEEP_ALIVE_TIME=60
+CAMEL_MAX_QUEUE_SIZE=1000
+
+#File Monitor configurations
+ssf_filemonitor_polling_interval=5
+ssf_filemonitor_threadpool_size=10
+
+#GRM/DME2 System Properties
+AFT_DME2_CONN_IDLE_TIMEOUTMS=5000
+AJSC_ENV=SOACLOUD
+
+SOACLOUD_NAMESPACE=com.att.ajsc
+SOACLOUD_ENV_CONTEXT=DEV
+SOACLOUD_PROTOCOL=http
+SOACLOUD_ROUTE_OFFER=DEFAULT
+
+sslport=8446
+server.port=8083
+
+AFT_LATITUDE=23.4
+AFT_LONGITUDE=33.6
+AFT_ENVIRONMENT=AFTUAT
+
+#Restlet Component Default Properties
+RESTLET_COMPONENT_CONTROLLER_DAEMON=true
+RESTLET_COMPONENT_CONTROLLER_SLEEP_TIME_MS=100
+RESTLET_COMPONENT_INBOUND_BUFFER_SIZE=8192
+RESTLET_COMPONENT_MIN_THREADS=1
+RESTLET_COMPONENT_MAX_THREADS=10
+RESTLET_COMPONENT_LOW_THREADS=8
+RESTLET_COMPONENT_MAX_QUEUED=0
+RESTLET_COMPONENT_MAX_CONNECTIONS_PER_HOST=-1
+RESTLET_COMPONENT_MAX_TOTAL_CONNECTIONS=-1
+RESTLET_COMPONENT_OUTBOUND_BUFFER_SIZE=8192
+RESTLET_COMPONENT_PERSISTING_CONNECTIONS=true
+RESTLET_COMPONENT_PIPELINING_CONNECTIONS=false
+RESTLET_COMPONENT_THREAD_MAX_IDLE_TIME_MS=60000
+RESTLET_COMPONENT_USE_FORWARDED_HEADER=false
+RESTLET_COMPONENT_REUSE_ADDRESS=true
+
+#Externalized jar and properties file location. In CSI environments, there are a few libs that have been externalized to aid
+#in CSTEM maintenance of the versions of these libs. The most important to the AJSC is the DME2 lib. Not only is this lib necessary
+#for proper registration of your AJSC service on a node, but it is also necessary for running locally as well. Another framework
+#used in CSI envs is the CSM framework. These 2 framework libs are shown as "provided" dependencies within the pom.xml. These
+#dependencies will be copied into the target/commonLibs folder with the normal "mvn clean package" goal of the AJSC. They will
+#then be added to the classpath via AJSC_EXTERNAL_LIB_FOLDERS system property. Any files (mainly property files) that need
+#to be on the classpath should be added to the AJSC_EXTERNAL_PROPERTIES_FOLDERS system property. The default scenario when 
+#testing your AJSC service locally will utilize the target/commonLibs directory for DME2 and CSM related artifacts and 2 
+#default csm properties files will be used for local testing with anything CSM knorelated.
+#NOTE: we are using maven-replacer-plugin to replace "(doubleUnderscore)basedir(doubleUnderscore)" with ${basedir} within the 
+#target directory for running locally. Multiple folder locations can be separated by the pipe ("|") character.
+#Please, NOTE: for running locally, we are setting this system property in the antBuild/build.xml "runLocal" target and in the 
+#"runAjsc" profile within the pom.xml. This is to most effectively use maven variables (${basedir}, most specifically. Therefore,
+#when running locally, the following 2 properties should be set within the profile(s) themselves. 
+#Example: target/commonLibs|target/otherLibs
+#AJSC_EXTERNAL_LIB_FOLDERS=__basedir__/target/commonLibs
+#AJSC_EXTERNAL_PROPERTIES_FOLDERS=__basedir__/ajsc-shared-config/etc
+#End of AJSC System Properties
+
+#Service System Properties. Please, place any Service related System Properties below.
+KEY_STORE_PASSWORD=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+KEY_MANAGER_PASSWORD=OBF:1vn21ugu1saj1v9i1v941sar1ugw1vo0
+AAI_CORE_VERSION=1.2.0-SNAPSHOT
diff --git a/aai-traversal/src/main/resources/etc/sysprops/template.sys-props.properties b/aai-traversal/src/main/resources/etc/sysprops/template.sys-props.properties
new file mode 100644
index 0000000..c9060f9
--- /dev/null
+++ b/aai-traversal/src/main/resources/etc/sysprops/template.sys-props.properties
@@ -0,0 +1,115 @@
+#This file is used for defining AJSC system properties for different configuration schemes and is necessary for the AJSC to run properly.
+#The sys-props.properties file is used for running locally.
+
+#For Cadi Authorization, use value="authentication-scheme-1"
+CadiAuthN=__AJSC_CADI_AUTHN__
+
+#For Basic Authorization, use value="authentication-scheme-1"
+authN=__AJSC_AUTH_SCHEME__
+
+#Persistence used for AJSC meta-data storage. For most environments, "file" should be used.
+ajscPersistence=__AJSC_PERSISTENCE__
+
+#Configure externalized logback location
+logback.configurationFile=__LOGBACK_CONFIG_FILE__
+
+# If using hawtio for local development, these properties will allow for faster server startup and usage for local development.
+# You may wish to deploy hawtio.war to dev/test environments to help debugging as well, but should not be used in PROD env.
+hawtio.authenticationEnabled=__HAWTIO_AUTHENTICATION_ENABLED__
+hawtio.config.pullOnStartup=__HAWTIO_CONFIG_PULLONSTARTUP__
+
+#Removes the extraneous restlet console output
+org.restlet.engine.loggerFacadeClass=org.restlet.ext.slf4j.Slf4jLoggerFacade
+
+#Enable/disable SSL (values=true/false).
+enableSSL=__AJSC_ENABLE_SSL__
+
+#Enable/disable csi logging (values=true/false).
+csiEnable=__CSI_ENABLE__
+
+#Enable/disable EJB Container
+ENABLE_EJB=__ENABLE_EJB__
+
+#Enable/disable OSGI
+isOSGIEnable=__OSGI_ENABLE__
+
+#Configure JMS Queue (WMQ/TIBCO)
+JMS_BROKER=WMQ
+
+#JMS properties needed for CSI Logging
+JMS_TIBCO_PROVIDER_URL=ONAPserverTBD
+JMS_LOGGER_USER_NAME=spm2
+JMS_LOGGER_PASSWORD=
+JMS_LOGGER_AUDIT_QUEUE_BINDING=pub.m2e.audit.logger.queue
+JMS_LOGGER_PERF_QUEUE_BINDING=log.csi.performance02
+
+#WMQ connectivity
+JMS_WMQ_PROVIDER_URL=__JMS_WMQ_PROVIDER_URL__
+JMS_WMQ_CONNECTION_FACTORY_NAME=__JMS_WMQ_CONNECTION_FACTORY_NAME__
+JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME=__JMS_WMQ_INITIAL_CONNECTION_FACTORY_NAME__
+JMS_WMQ_AUDIT_DESTINATION_NAME=__JMS_WMQ_AUDIT_DESTINATION_NAME__ 
+JMS_WMQ_PERF_DESTINATION_NAME=__JMS_WMQ_PERF_DESTINATION_NAME__
+
+#CSI related variables for CSM framework
+csm.hostname=d1a-m2e-q112m2e1.edc.cingular.net
+
+#Enable/disable endpoint level logging (values=true/false). 
+endpointLogging=__END_POINT_LEVEL_LOGGING__
+
+#SOA_CLOUD_ENV is used to register your service with dme2 (values=true/false).
+SOA_CLOUD_ENV=__SOA_CLOUD_ENV__
+
+#Jetty Container ThreadCount Configuration Variables
+AJSC_JETTY_ThreadCount_MAX=__AJSC_JETTY_ThreadCount_MAX__
+AJSC_JETTY_ThreadCount_MIN=__AJSC_JETTY_ThreadCount_MIN__
+AJSC_JETTY_IDLETIME_MAX=__AJSC_JETTY_IDLETIME_MAX__
+AJSC_SERVICE_NAMESPACE=ActiveAndAvailableInventory-Traversal
+AJSC_SERVICE_VERSION=__AJSC_SERVICE_VERSION__
+AJSC_JETTY_BLOCKING_QUEUE_SIZE=100
+
+#Camel Context level default threadPool Profile configuration
+CAMEL_POOL_SIZE=__CAMEL_POOL_SIZE__
+CAMEL_MAX_POOL_SIZE=__CAMEL_MAX_POOL_SIZE__
+CAMEL_KEEP_ALIVE_TIME=__CAMEL_KEEP_ALIVE_TIME__
+CAMEL_MAX_QUEUE_SIZE=__CAMEL_MAX_QUEUE_SIZE__
+
+#File Monitor configurations
+ssf_filemonitor_polling_interval=__AJSC_SSF_FILE_MONITOR_POLLING_INTERVAL__
+ssf_filemonitor_threadpool_size=__AJSC_SSF_FILE_MONITOR_THREAD_POOL_SIZE__
+
+#GRM/DME2 System Properties below
+AFT_DME2_CONN_IDLE_TIMEOUTMS=__AFT_DME2_CONN_IDLE_TIMEOUTMS__
+AJSC_ENV=__AJSC_ENV__
+SOACLOUD_NAMESPACE=__SOA_CLOUD_NAMESPACE__
+SOACLOUD_ENV_CONTEXT=__SCLD_ENV__
+SOACLOUD_PROTOCOL=__SOACLOUD_PROTOCOL__
+SOACLOUD_ROUTE_OFFER=__AAIENV__
+sslport=8446
+server.port=8083
+AFT_LATITUDE=__LATITUDE__
+AFT_LONGITUDE=__LONGITUDE__
+AFT_ENVIRONMENT=__AFT_ENVIRONMENT__
+
+#Restlet Component Properties
+RESTLET_COMPONENT_CONTROLLER_DAEMON=__RESTLET_COMPONENT_CONTROLLER_DAEMON__
+RESTLET_COMPONENT_CONTROLLER_SLEEP_TIME_MS=__RESTLET_COMPONENT_CONTROLLER_SLEEP_TIME_MS__
+RESTLET_COMPONENT_INBOUND_BUFFER_SIZE=__RESTLET_COMPONENT_INBOUND_BUFFER_SIZE__
+RESTLET_COMPONENT_MIN_THREADS=__RESTLET_COMPONENT_MIN_THREADS__
+RESTLET_COMPONENT_MAX_THREADS=__RESTLET_COMPONENT_MAX_THREADS__
+RESTLET_COMPONENT_LOW_THREADS=__RESTLET_COMPONENT_LOW_THREADS__
+RESTLET_COMPONENT_MAX_QUEUED=__RESTLET_COMPONENT_MAX_QUEUED__
+RESTLET_COMPONENT_MAX_CONNECTIONS_PER_HOST=__RESTLET_COMPONENT_MAX_CONNECTIONS_PER_HOST__
+RESTLET_COMPONENT_MAX_TOTAL_CONNECTIONS=__RESTLET_COMPONENT_MAX_TOTAL_CONNECTIONS__
+RESTLET_COMPONENT_OUTBOUND_BUFFER_SIZE=__RESTLET_COMPONENT_OUTBOUND_BUFFER_SIZE__
+RESTLET_COMPONENT_PERSISTING_CONNECTIONS=__RESTLET_COMPONENT_PERSISTING_CONNECTIONS__
+RESTLET_COMPONENT_PIPELINING_CONNECTIONS=__RESTLET_COMPONENT_PIPELINING_CONNECTIONS__
+RESTLET_COMPONENT_THREAD_MAX_IDLE_TIME_MS=__RESTLET_COMPONENT_THREAD_MAX_IDLE_TIME_MS__
+RESTLET_COMPONENT_USE_FORWARDED_HEADER=__RESTLET_COMPONENT_USE_FORWARDED_HEADER__
+RESTLET_COMPONENT_REUSE_ADDRESS=__RESTLET_COMPONENT_REUSE_ADDRESS__
+
+AJSC_EXTERNAL_LIB_FOLDERS=__CSM_LIB__|__DME2_LIB__|__AJSC_EXTERNAL_LIB_FOLDERS__
+AJSC_EXTERNAL_PROPERTIES_FOLDERS=__AJSC_SHARED_CONFIG__|__AJSC_EXTERNAL_PROPERTIES_FOLDERS__
+
+KEY_STORE_PASSWORD=__KEY_STORE_PASSWORD__
+KEY_MANAGER_PASSWORD=__KEY_MANAGER_PASSWORD__
+AAI_CORE_VERSION=1.2.0-SNAPSHOT
author	Venkata Harish K Kajur <vk250x@att.com>	2018-02-06 15:06:44 -0500
committer	Venkata Harish K Kajur <vk250x@att.com>	2018-03-07 10:02:36 -0500
commit	a0d3e8ee8d78d41e4a58437983bc4c894d0024df (patch)
tree	37f4698a9481349548eec326f2845f8cb1abd06f /aai-traversal/src/main/resources/etc
parent	e688a3115c5de57ca9ac3e218fad6ecb50d6f8b1 (diff)