Merge branch 'master' of /home/jwagantall/linuxfoundation/onap/IT-21112/sli-adaptors

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

4 files changed, 221 insertions, 0 deletions

diff --git a/aai-service/provider/src/test/resources/aaiclient.properties b/aai-service/provider/src/test/resources/aaiclient.properties
new file mode 100755
index 000000000..571280b81
--- /dev/null
+++ b/aai-service/provider/src/test/resources/aaiclient.properties
@@ -0,0 +1,80 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# Copyright (C) 2017 AT&T Intellectual Property. All rights
+# 						reserved.
+# ================================================================================
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ============LICENSE_END=========================================================
+###
+
+#
+# Configuration file for A&AI Client
+#
+
+#
+# Certificate keystore and truststore
+#
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/ccsdk/data/stores/truststore.onap.client.jks
+org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=adminadmin
+org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true
+
+org.onap.ccsdk.sli.adaptors.aai.client.name=SDNC
+org.onap.ccsdk.sli.adaptors.aai.client.psswd=SDNC
+
+org.onap.ccsdk.sli.adaptors.aai.application=CCSDK
+#
+# Configuration file for A&AI Client
+#
+org.onap.ccsdk.sli.adaptors.aai.uri=https://aai.api.simpledemo.onap.org:8443
+connection.timeout=60000
+read.timeout=60000
+
+# aai version
+org.onap.ccsdk.sli.adaptors.aai.version=/v21/
+
+# query
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v21/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v21/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
+org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v21/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
+
+#update
+org.onap.ccsdk.sli.adaptors.aai.update=/aai/v21/actions/update
+
+# UBB Notify
+org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v21/actions/notify
+org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}
+org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information
+
+# P-Interfaces
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v21/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v21/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
+
+# VNF IMAGES
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v21/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+
+# service instance
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v21/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance
+org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v21/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
+
+# VNF IMAGES QUERY
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v21/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
+
+#
+# Formatting
+#
+org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s
+org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type
+org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id
+org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type
diff --git a/aai-service/provider/src/test/resources/json/linterfaceJson.txt b/aai-service/provider/src/test/resources/json/linterfaceJson.txt
new file mode 100755
index 000000000..22c8db1ee
--- /dev/null
+++ b/aai-service/provider/src/test/resources/json/linterfaceJson.txt
@@ -0,0 +1,43 @@
+      {
+        "interface-name": "example-interface-name-val-1600",
+        "interface-role": "example-interface-role-val-1600",
+        "v6-wan-link-ip": "example-v6-wan-link-ip-val-1600",
+        "resource-version": "1450729537",
+        "vlans": {
+          "vlan": [
+            {
+              "vlan-interface": "example-vlan-interface-val-7133",
+              "vlan-id-inner": 1318,
+              "vlan-id-outer": 244,
+              "resource-version": "1450729537",
+              "relationship-list": {
+                
+              },
+              "l3-interface-ipv4-address-list": [
+                {
+                  "l3-interface-ipv4-address": "example-l3-interface-ipv4-address-val-9533",
+                  "l3-interface-ipv4-prefix-length": 3013,
+                  "vlan-id-inner": 7150,
+                  "vlan-id-outer": 1027,
+                  "resource-version": "1450729537",
+                  "relationship-list": {
+                    
+                  }
+                }
+              ],
+              "l3-interface-ipv6-address-list": [
+                {
+                  "l3-interface-ipv6-address": "example-l3-interface-ipv6-address-val-7149",
+                  "l3-interface-ipv6-prefix-length": 4538,
+                  "vlan-id-inner": 8271,
+                  "vlan-id-outer": 8990,
+                  "resource-version": "1450729537",
+                  "relationship-list": {
+                    
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      }
\ No newline at end of file
diff --git a/aai-service/provider/src/test/resources/json/pserverJson.txt b/aai-service/provider/src/test/resources/json/pserverJson.txt
new file mode 100755
index 000000000..4b7f97d37
--- /dev/null
+++ b/aai-service/provider/src/test/resources/json/pserverJson.txt
@@ -0,0 +1,97 @@
+{
+  "selflink": "https://mtinjvmsdn30.cip.att.com:8443/aai/v4/network/pservers/pserver/chcil129snd",
+  "hostname": "chcil129snd",
+  "ptnii-equip-name": "chcil129snd",
+  "equip-type": "server1",
+  "equip-vendor": "HP",
+  "equip-model": "DL380p-nd",
+  "fqdn": "chcilrsv129.chcil.sbcglobal.net",
+  "ipv4-oam-address": "12.80.1.83",
+  "serial-number": "n02kvcBczBI",
+  "in-maint":false,
+  "resource-version": "1455988020",
+  "purpose": "Gamma-VCE",
+  "relationship-list": {
+    "relationship": [
+      {
+        "related-to": "complex",
+        "related-link": "https://aai.infra.aic.att.net:8443/aai/v5/cloud-infrastructure/complexes/complex/CHCGILCL73W/",
+        "relationship-data": [
+          {
+            "relationship-key": "complex.physical-location-id",
+            "relationship-value": "CHCGILCL73W"
+          }
+        ]
+      }
+    ]
+  },
+  "p-interfaces": {
+    "p-interface": [
+      {
+        "interface-name": "p6p2-6/2",
+        "speed-value": "10000000",
+        "speed-units": "kbps",
+        "resource-version": "1455988020",
+        "relationship-list": {
+          "relationship": [
+            {
+              "related-to": "physical-link",
+              "related-link": "https://aai.infra.aic.att.net:8443/aai/v5/network/physical-links/physical-link/chcil129snd%3Ap6p2-6%2F2%7Cchciltax102%3Axe-1%2F0%2F29/",
+              "relationship-data": [
+                {
+                  "relationship-key": "physical-link.link-name",
+                  "relationship-value": "chcil129snd:p6p2-6/2|chciltax102:xe-1/0/29"
+                }
+              ]
+            }
+          ]
+        },
+        "l-interfaces": {
+          
+        }
+      },
+      {
+        "interface-name": "p6p1-6/1",
+        "speed-value": "10000000",
+        "speed-units": "kbps",
+        "resource-version": "1455988020",
+        "relationship-list": {
+          "relationship": [
+            {
+              "related-to": "physical-link",
+              "related-link": "https://aai.infra.aic.att.net:8443/aai/v5/network/physical-links/physical-link/chcil129snd%3Ap6p1-6%2F1%7Cchciltax101%3Axe-0%2F0%2F29/",
+              "relationship-data": [
+                {
+                  "relationship-key": "physical-link.link-name",
+                  "relationship-value": "chcil129snd:p6p1-6/1|chciltax101:xe-0/0/29"
+                }
+              ]
+            }
+          ]
+        },
+        "l-interfaces": {
+          
+        }
+      },
+      {
+        "interface-name": "em0-0/1",
+        "speed-value": "10000000",
+        "speed-units": "kbps",
+        "resource-version": "1455988020",
+        "relationship-list": {
+          "relationship": [
+            {
+              "related-to": "physical-link",
+              "related-link": "https://aai.infra.aic.att.net:8443/aai/v5/network/physical-links/physical-link/chcil129snd%3Aem0-0%2F1%7Cchciltax101%3Axe-0%2F0%2F59/",
+              "relationship-data": [
+                {
+                  
+                }
+              ]
+            }
+          ]
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/aai-service/provider/src/test/resources/testCommands.txt b/aai-service/provider/src/test/resources/testCommands.txt
new file mode 100644
index 000000000..d19b8d306
--- /dev/null
+++ b/aai-service/provider/src/test/resources/testCommands.txt
@@ -0,0 +1 @@
+query|generic-vnf|generic-vnf.vnf-id:assign:value:adb28ac0-a260-4b7d-9ce5-adf15733c458
\ No newline at end of file