summaryrefslogtreecommitdiffstats
path: root/aai-service/provider/src/test
diff options
context:
space:
mode:
authorRich Tabedzki <richard.tabedzki@att.com>2018-04-23 15:50:06 -0400
committerRich Tabedzki <richard.tabedzki@att.com>2018-04-23 21:50:45 -0400
commit8ed112cc25f33315e453b238478c4a1fde3e257e (patch)
tree0e12d80002353e702f64733492736ed03d26a5de /aai-service/provider/src/test
parentaed80a23d7fb16b5106a0bd242aa7e60ff451c67 (diff)
Fixing trustStore issues in AAI Client
Changes made: * Updated AAI XSD model to v13 * Updated AAI interface path definitions Change-Id: I047845e574734b45dda67e1f84b3bb07dacca426 Issue-ID: CCSDK-247 Signed-off-by: Rich Tabedzki <richard.tabedzki@att.com>
Diffstat (limited to 'aai-service/provider/src/test')
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java2
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java2
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/ResponseMessageTest.java119
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java189
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java225
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFiltersTest.java74
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java284
-rwxr-xr-xaai-service/provider/src/test/resources/aaiclient.properties196
10 files changed, 465 insertions, 630 deletions
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
index 011b926c0..5be8a73e0 100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java
@@ -51,7 +51,7 @@ import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.openecomp.aai.inventory.v11.*;
+import org.openecomp.aai.inventory.v13.*;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
index 9bc93609a..0e616d576 100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AutoGeneratedRegressionTest.java
@@ -63,7 +63,7 @@ import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
import org.onap.ccsdk.sli.adaptors.aai.query.NamedQueryData;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.aai.inventory.v11.GenericVnf;
+import org.openecomp.aai.inventory.v13.GenericVnf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.annotation.AnnotationUtils;
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
index eb84cfdf3..eaedf66f6 100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericRequestTest.java
@@ -38,7 +38,7 @@ import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
import org.onap.ccsdk.sli.adaptors.aai.data.AAIDatum;
-import org.openecomp.aai.inventory.v11.LInterface;
+import org.openecomp.aai.inventory.v13.LInterface;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
index afdc4d26e..8ed704d7a 100755
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java
@@ -49,7 +49,7 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIRequest;
import org.onap.ccsdk.sli.adaptors.aai.AAIService;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
-import org.openecomp.aai.inventory.v11.GenericVnf;
+import org.openecomp.aai.inventory.v13.GenericVnf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/ResponseMessageTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/ResponseMessageTest.java
index 04c9963b5..daf95b02d 100644
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/ResponseMessageTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/ResponseMessageTest.java
@@ -1,71 +1,68 @@
-package org.onap.ccsdk.sli.adaptors.aai.data;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
+package org.onap.ccsdk.sli.adaptors.aai.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
import org.junit.After;
import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.aai.inventory.v11.Vlans;
+import org.junit.Test;
+
+public class ResponseMessageTest {
+
+ ResponseMessage _rmInstance;
+ protected String _messageId;
+ protected String _text;
+ protected Variables _variables;
+ protected Map<String, Object> _additionalProperties;
-public class ResponseMessageTest {
-
- ResponseMessage _rmInstance;
- protected String _messageId;
- protected String _text;
- protected Variables _variables;
- protected Map<String, Object> _additionalProperties;
-
- @Before
- public void setUp() throws Exception {
- _rmInstance = new ResponseMessage();
- _messageId = "messageId";
- _text = "text";
- _variables = mock(Variables.class);
- _additionalProperties = new HashMap<String, Object>() {{
- put("prop1", "propvalue1");
- put("prop2", "propvalue2");
- }};
- }
+ @Before
+ public void setUp() throws Exception {
+ _rmInstance = new ResponseMessage();
+ _messageId = "messageId";
+ _text = "text";
+ _variables = mock(Variables.class);
+ _additionalProperties = new HashMap<String, Object>() {{
+ put("prop1", "propvalue1");
+ put("prop2", "propvalue2");
+ }};
+ }
- @After
- public void tearDown() throws Exception {
- _rmInstance = null;
- _messageId = null;
- _text = null;
- _variables = null;
- _additionalProperties = null;
- }
+ @After
+ public void tearDown() throws Exception {
+ _rmInstance = null;
+ _messageId = null;
+ _text = null;
+ _variables = null;
+ _additionalProperties = null;
+ }
- @Test
- public void testSetMessageId() {
- _rmInstance.setMessageId(_messageId);
- assertTrue(_rmInstance.getMessageId().equals(_messageId));
- }
+ @Test
+ public void testSetMessageId() {
+ _rmInstance.setMessageId(_messageId);
+ assertTrue(_rmInstance.getMessageId().equals(_messageId));
+ }
- @Test
- public void testSetText() {
- _rmInstance.setText(_text);
- assertTrue(_rmInstance.getText().equals(_text));
- }
+ @Test
+ public void testSetText() {
+ _rmInstance.setText(_text);
+ assertTrue(_rmInstance.getText().equals(_text));
+ }
- @Test
- public void testSetVariables() {
- _rmInstance.setVariables(_variables);
- assertEquals(_rmInstance.getVariables(), _variables);
- }
+ @Test
+ public void testSetVariables() {
+ _rmInstance.setVariables(_variables);
+ assertEquals(_rmInstance.getVariables(), _variables);
+ }
- @Test
- public void testSetAdditionalProperty() {
- _rmInstance.setAdditionalProperty("prop1", "propvalue1");
- _rmInstance.setAdditionalProperty("prop2", "propvalue2");
- assertEquals(_rmInstance.getAdditionalProperties(), _additionalProperties);
- }
+ @Test
+ public void testSetAdditionalProperty() {
+ _rmInstance.setAdditionalProperty("prop1", "propvalue1");
+ _rmInstance.setAdditionalProperty("prop2", "propvalue2");
+ assertEquals(_rmInstance.getAdditionalProperties(), _additionalProperties);
+ }
}
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
index 66717103d..21fc86d12 100644
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
@@ -1,95 +1,94 @@
-package org.onap.ccsdk.sli.adaptors.aai.data;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.mock;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.openecomp.aai.inventory.v11.RelationshipList;
-import org.openecomp.aai.inventory.v11.Vlans;
-
-public class SubInterfaceTest {
-
- SubInterface _siInstance;
- protected String _interfaceName;
- protected String _interfaceRole;
- protected String _resourceVersion;
- protected Vlans _vlans;
- protected RelationshipList _relationshipList;
- protected Map<String, Object> _additionalProperties;
-
- @Before
- public void setUp() throws Exception {
- _siInstance = new SubInterface();
- _interfaceName = "interfaceName";
- _interfaceRole = "interfaceRole";
- _resourceVersion = "resourceVersion";
- _vlans = mock(Vlans.class);
- _relationshipList = mock(RelationshipList.class);
-
- _additionalProperties = new HashMap<String, Object>() {{
- put("prop1", "propvalue1");
- put("prop2", "propvalue2");
- }};
-
- }
-
- @After
- public void tearDown() throws Exception {
- _siInstance = null;
- _interfaceName = null;
- _interfaceRole = null;
- _resourceVersion = null;
- _vlans = null;
- _relationshipList = null;
- _additionalProperties = null;
- }
-
- @Test
- public void testSetInterfaceName() {
- _siInstance.setInterfaceName(_interfaceName);
- assertTrue(_siInstance.getInterfaceName().equals(_interfaceName));
- }
-
-
- @Test
- public void testSetInterfaceRole() {
- _siInstance.setInterfaceRole(_interfaceRole);
- assertTrue(_siInstance.getInterfaceRole().equals(_interfaceRole));
- }
-
-
- @Test
- public void testSetResourceVersion() {
- _siInstance.setResourceVersion(_resourceVersion);
- assertTrue(_siInstance.getResourceVersion().equals(_resourceVersion));
- }
-
-
- @Test
- public void testSetVlans() {
- _siInstance.setVlans(_vlans);
- assertTrue(_siInstance.getVlans().equals(_vlans));
- }
-
-
- @Test
- public void testSetRelationshipList() {
- _siInstance.setRelationshipList(_relationshipList);
- assertTrue(_siInstance.getRelationshipList().equals(_relationshipList));
- }
-
- @Test
- public void testSetAdditionalProperties() {
- _siInstance.setAdditionalProperty("prop1", "propvalue1");
- _siInstance.setAdditionalProperty("prop2", "propvalue2");
- assertEquals(_siInstance.getAdditionalProperties(), _additionalProperties);
- }
-
-}
+package org.onap.ccsdk.sli.adaptors.aai.data;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.openecomp.aai.inventory.v13.RelationshipList;
+import org.openecomp.aai.inventory.v13.Vlans;
+
+public class SubInterfaceTest {
+
+ SubInterface _siInstance;
+ protected String _interfaceName;
+ protected String _interfaceRole;
+ protected String _resourceVersion;
+ protected Vlans _vlans;
+ protected RelationshipList _relationshipList;
+ protected Map<String, Object> _additionalProperties;
+
+ @Before
+ public void setUp() throws Exception {
+ _siInstance = new SubInterface();
+ _interfaceName = "interfaceName";
+ _interfaceRole = "interfaceRole";
+ _resourceVersion = "resourceVersion";
+ _vlans = mock(Vlans.class);
+ _relationshipList = mock(RelationshipList.class);
+
+ _additionalProperties = new HashMap<String, Object>() {{
+ put("prop1", "propvalue1");
+ put("prop2", "propvalue2");
+ }};
+
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ _siInstance = null;
+ _interfaceName = null;
+ _interfaceRole = null;
+ _resourceVersion = null;
+ _vlans = null;
+ _relationshipList = null;
+ _additionalProperties = null;
+ }
+
+ @Test
+ public void testSetInterfaceName() {
+ _siInstance.setInterfaceName(_interfaceName);
+ assertTrue(_siInstance.getInterfaceName().equals(_interfaceName));
+ }
+
+
+ @Test
+ public void testSetInterfaceRole() {
+ _siInstance.setInterfaceRole(_interfaceRole);
+ assertTrue(_siInstance.getInterfaceRole().equals(_interfaceRole));
+ }
+
+
+ @Test
+ public void testSetResourceVersion() {
+ _siInstance.setResourceVersion(_resourceVersion);
+ assertTrue(_siInstance.getResourceVersion().equals(_resourceVersion));
+ }
+
+
+ @Test
+ public void testSetVlans() {
+ _siInstance.setVlans(_vlans);
+ assertTrue(_siInstance.getVlans().equals(_vlans));
+ }
+
+
+ @Test
+ public void testSetRelationshipList() {
+ _siInstance.setRelationshipList(_relationshipList);
+ assertTrue(_siInstance.getRelationshipList().equals(_relationshipList));
+ }
+
+ @Test
+ public void testSetAdditionalProperties() {
+ _siInstance.setAdditionalProperty("prop1", "propvalue1");
+ _siInstance.setAdditionalProperty("prop2", "propvalue2");
+ assertEquals(_siInstance.getAdditionalProperties(), _additionalProperties);
+ }
+
+}
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
index 1bc226ec5..2a115d708 100644
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java
@@ -1,127 +1,124 @@
package org.onap.ccsdk.sli.adaptors.aai.query;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
-import java.util.ArrayList;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-
-import org.openecomp.aai.inventory.v11.CloudRegion;
-import org.openecomp.aai.inventory.v11.GenericVnf;
-import org.openecomp.aai.inventory.v11.L3Network;
-import org.openecomp.aai.inventory.v11.Pnf;
-import org.openecomp.aai.inventory.v11.LogicalLink;
-import org.openecomp.aai.inventory.v11.PInterface;
-import org.openecomp.aai.inventory.v11.ServiceInstance;
-import org.openecomp.aai.inventory.v11.Tenant;
-import org.openecomp.aai.inventory.v11.Vnf;
-import org.openecomp.aai.inventory.v11.Vserver;
+import org.openecomp.aai.inventory.v13.CloudRegion;
+import org.openecomp.aai.inventory.v13.GenericVnf;
+import org.openecomp.aai.inventory.v13.L3Network;
+import org.openecomp.aai.inventory.v13.LogicalLink;
+import org.openecomp.aai.inventory.v13.PInterface;
+import org.openecomp.aai.inventory.v13.Pnf;
+import org.openecomp.aai.inventory.v13.ServiceInstance;
+import org.openecomp.aai.inventory.v13.Tenant;
+import org.openecomp.aai.inventory.v13.Vnf;
+import org.openecomp.aai.inventory.v13.Vserver;
public class InstanceFilterTest {
-
- InstanceFilter _ifInstance;
- protected LogicalLink _logicalLink;
- protected Pnf _pnf;
- protected L3Network _l3Network;
- protected PInterface _pInterface;
- protected GenericVnf _genericVnf;
- protected Vserver _vserver;
- protected Tenant _tenant;
- protected CloudRegion _cloudRegion;
- protected ServiceInstance _serviceInstance;
- protected Vnf _vnfc;
- protected Map<String, Object> _additionalProperties;
-
- @Before
- public void setUp() throws Exception {
- _ifInstance = new InstanceFilter();
- LogicalLink _logicalLink = mock(LogicalLink.class);
- Pnf _pnf = mock(Pnf.class);
- L3Network _l3Network = mock(L3Network.class);
- PInterface _pInterface = mock(PInterface.class);
- GenericVnf _genericVnf = mock(GenericVnf.class);
- Vserver _vserver = mock(Vserver.class);
- Tenant _tenant = mock(Tenant.class);
- CloudRegion _cloudRegion = mock(CloudRegion.class);
- ServiceInstance _serviceInstance = mock(ServiceInstance.class);
- // as per class
- Vnf _vnfc = mock(Vnf.class);
- _additionalProperties = new HashMap<String, Object>() {{
- put("prop1", "propvalue1");
- put("prop2", "propvalue2");
- }};
- }
-
- @After
- public void tearDown() throws Exception {
- _ifInstance = null;
- _additionalProperties = null;
- }
-
- @Test
- public void testSetLogicalLink() {
- _ifInstance.setLogicalLink(_logicalLink);
- assertEquals(_ifInstance.getLogicalLink(), _logicalLink);
- }
-
- @Test
- public void testSetPnf() {
- _ifInstance.setPnf(_pnf);
- assertEquals(_ifInstance.getPnf(), _pnf);
- }
-
- @Test
- public void testSetL3Network() {
- _ifInstance.setL3Network(_l3Network);
- assertEquals(_ifInstance.getL3Network(), _l3Network);
- }
-
- @Test
- public void testSetServiceInstance() {
- _ifInstance.setServiceInstance(_serviceInstance);
- assertEquals(_ifInstance.getServiceInstance(), _serviceInstance);
- }
-
- @Test
- public void testSetGenericVnf() {
- _ifInstance.setGenericVnf(_genericVnf);
- assertEquals(_ifInstance.getGenericVnf(), _genericVnf);
- }
-
- @Test
- public void testSetVserver() {
- _ifInstance.setVserver(_vserver);
- assertEquals(_ifInstance.getVserver(), _vserver);
- }
-
- @Test
- public void testSetTenant() {
- _ifInstance.setTenant(_tenant);
- assertEquals(_ifInstance.getTenant(), _tenant);
- }
-
- @Test
- public void testSetCloudRegion() {
- _ifInstance.setCloudRegion(_cloudRegion);
- assertEquals(_ifInstance.getCloudRegion(), _cloudRegion);
- }
-
- @Test
- public void testSetVnfc() {
- _ifInstance.setVnfc(_vnfc);
- assertEquals(_ifInstance.getVnfc(), _vnfc);
- }
-
- @Test
- public void testSetAdditionalProperty() {
- _ifInstance.setAdditionalProperty("prop1", "propvalue1");
- _ifInstance.setAdditionalProperty("prop2", "propvalue2");
- assertEquals(_ifInstance.getAdditionalProperties(), _additionalProperties);
- }
+
+ InstanceFilter _ifInstance;
+ protected LogicalLink _logicalLink;
+ protected Pnf _pnf;
+ protected L3Network _l3Network;
+ protected PInterface _pInterface;
+ protected GenericVnf _genericVnf;
+ protected Vserver _vserver;
+ protected Tenant _tenant;
+ protected CloudRegion _cloudRegion;
+ protected ServiceInstance _serviceInstance;
+ protected Vnf _vnfc;
+ protected Map<String, Object> _additionalProperties;
+
+ @Before
+ public void setUp() throws Exception {
+ _ifInstance = new InstanceFilter();
+ LogicalLink _logicalLink = mock(LogicalLink.class);
+ Pnf _pnf = mock(Pnf.class);
+ L3Network _l3Network = mock(L3Network.class);
+ PInterface _pInterface = mock(PInterface.class);
+ GenericVnf _genericVnf = mock(GenericVnf.class);
+ Vserver _vserver = mock(Vserver.class);
+ Tenant _tenant = mock(Tenant.class);
+ CloudRegion _cloudRegion = mock(CloudRegion.class);
+ ServiceInstance _serviceInstance = mock(ServiceInstance.class);
+ // as per class
+ Vnf _vnfc = mock(Vnf.class);
+ _additionalProperties = new HashMap<String, Object>() {{
+ put("prop1", "propvalue1");
+ put("prop2", "propvalue2");
+ }};
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ _ifInstance = null;
+ _additionalProperties = null;
+ }
+
+ @Test
+ public void testSetLogicalLink() {
+ _ifInstance.setLogicalLink(_logicalLink);
+ assertEquals(_ifInstance.getLogicalLink(), _logicalLink);
+ }
+
+ @Test
+ public void testSetPnf() {
+ _ifInstance.setPnf(_pnf);
+ assertEquals(_ifInstance.getPnf(), _pnf);
+ }
+
+ @Test
+ public void testSetL3Network() {
+ _ifInstance.setL3Network(_l3Network);
+ assertEquals(_ifInstance.getL3Network(), _l3Network);
+ }
+
+ @Test
+ public void testSetServiceInstance() {
+ _ifInstance.setServiceInstance(_serviceInstance);
+ assertEquals(_ifInstance.getServiceInstance(), _serviceInstance);
+ }
+
+ @Test
+ public void testSetGenericVnf() {
+ _ifInstance.setGenericVnf(_genericVnf);
+ assertEquals(_ifInstance.getGenericVnf(), _genericVnf);
+ }
+
+ @Test
+ public void testSetVserver() {
+ _ifInstance.setVserver(_vserver);
+ assertEquals(_ifInstance.getVserver(), _vserver);
+ }
+
+ @Test
+ public void testSetTenant() {
+ _ifInstance.setTenant(_tenant);
+ assertEquals(_ifInstance.getTenant(), _tenant);
+ }
+
+ @Test
+ public void testSetCloudRegion() {
+ _ifInstance.setCloudRegion(_cloudRegion);
+ assertEquals(_ifInstance.getCloudRegion(), _cloudRegion);
+ }
+
+ @Test
+ public void testSetVnfc() {
+ _ifInstance.setVnfc(_vnfc);
+ assertEquals(_ifInstance.getVnfc(), _vnfc);
+ }
+
+ @Test
+ public void testSetAdditionalProperty() {
+ _ifInstance.setAdditionalProperty("prop1", "propvalue1");
+ _ifInstance.setAdditionalProperty("prop2", "propvalue2");
+ assertEquals(_ifInstance.getAdditionalProperties(), _additionalProperties);
+ }
}
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFiltersTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFiltersTest.java
index e44e8454b..6131e13e0 100644
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFiltersTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFiltersTest.java
@@ -14,42 +14,42 @@ import org.junit.Test;
public class InstanceFiltersTest {
- InstanceFilters _ifsInstance;
- protected List<InstanceFilter> _instanceFilter;
- protected Map<String, Object> _additionalProperties;
-
- @Before
- public void setUp() throws Exception {
- _ifsInstance = new InstanceFilters();
- _instanceFilter = new ArrayList<>();
- InstanceFilter if1 = mock(InstanceFilter.class);
- InstanceFilter if2 = mock(InstanceFilter.class);
- _instanceFilter.add(if1);
- _instanceFilter.add(if2);
- _additionalProperties = new HashMap<String, Object>() {{
- put("prop1", "propvalue1");
- put("prop2", "propvalue2");
- }};
- }
-
- @After
- public void tearDown() throws Exception {
- _ifsInstance = null;
- _instanceFilter = null;
- _additionalProperties = null;
- }
-
- @Test
- public void testSetInstanceFilter() {
- _ifsInstance.setInstanceFilter(_instanceFilter);
- assertEquals(_ifsInstance.getInstanceFilter(), _instanceFilter);
-
- }
-
- @Test
- public void testSetAdditionalProperty() {
- _ifsInstance.setAdditionalProperty("prop1", "propvalue1");
- _ifsInstance.setAdditionalProperty("prop2", "propvalue2");
- }
+ InstanceFilters _ifsInstance;
+ protected List<InstanceFilter> _instanceFilter;
+ protected Map<String, Object> _additionalProperties;
+
+ @Before
+ public void setUp() throws Exception {
+ _ifsInstance = new InstanceFilters();
+ _instanceFilter = new ArrayList<>();
+ InstanceFilter if1 = mock(InstanceFilter.class);
+ InstanceFilter if2 = mock(InstanceFilter.class);
+ _instanceFilter.add(if1);
+ _instanceFilter.add(if2);
+ _additionalProperties = new HashMap<String, Object>() {{
+ put("prop1", "propvalue1");
+ put("prop2", "propvalue2");
+ }};
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ _ifsInstance = null;
+ _instanceFilter = null;
+ _additionalProperties = null;
+ }
+
+ @Test
+ public void testSetInstanceFilter() {
+ _ifsInstance.setInstanceFilter(_instanceFilter);
+ assertEquals(_ifsInstance.getInstanceFilter(), _instanceFilter);
+
+ }
+
+ @Test
+ public void testSetAdditionalProperty() {
+ _ifsInstance.setAdditionalProperty("prop1", "propvalue1");
+ _ifsInstance.setAdditionalProperty("prop2", "propvalue2");
+ }
}
diff --git a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
index 4bec98724..576778bb5 100644
--- a/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
+++ b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java
@@ -10,150 +10,150 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import org.openecomp.aai.inventory.v11.CloudRegion;
-import org.openecomp.aai.inventory.v11.Complex;
-import org.openecomp.aai.inventory.v11.Configuration;
-import org.openecomp.aai.inventory.v11.GenericVnf;
-import org.openecomp.aai.inventory.v11.L3InterfaceIpv4AddressList;
-import org.openecomp.aai.inventory.v11.L3InterfaceIpv6AddressList;
-import org.openecomp.aai.inventory.v11.L3Network;
-import org.openecomp.aai.inventory.v11.LInterface;
-//import org.openecomp.aai.inventory.v11.OwningEntity;
-import org.openecomp.aai.inventory.v11.Pserver;
-import org.openecomp.aai.inventory.v11.ServiceInstance;
-import org.openecomp.aai.inventory.v11.Vnfc;
-import org.openecomp.aai.inventory.v11.Vserver;
+import org.openecomp.aai.inventory.v13.CloudRegion;
+import org.openecomp.aai.inventory.v13.Complex;
+import org.openecomp.aai.inventory.v13.Configuration;
+import org.openecomp.aai.inventory.v13.GenericVnf;
+import org.openecomp.aai.inventory.v13.L3InterfaceIpv4AddressList;
+import org.openecomp.aai.inventory.v13.L3InterfaceIpv6AddressList;
+import org.openecomp.aai.inventory.v13.L3Network;
+import org.openecomp.aai.inventory.v13.LInterface;
+//import org.openecomp.aai.inventory.v13.OwningEntity;
+import org.openecomp.aai.inventory.v13.Pserver;
+import org.openecomp.aai.inventory.v13.ServiceInstance;
+import org.openecomp.aai.inventory.v13.Vnfc;
+import org.openecomp.aai.inventory.v13.Vserver;
public class ResultTest {
- Result _rInstance;
-
- protected CloudRegion _cloudRegion;
- protected Complex _complex;
- protected Configuration _configuration;
- protected GenericVnf _genericVnf;
- protected L3InterfaceIpv4AddressList _l3InterfaceIpv4AddressList;
- protected L3InterfaceIpv6AddressList _l3InterfaceIpv6AddressList;
- protected L3Network _l3Network;
- protected LInterface _lInterface;
- protected Pserver _pserver;
- protected ServiceInstance _serviceInstance;
- protected Vnfc _vnfc;
- protected Vserver _vserver;
-
- protected Map<String, Object> _additionalProperties;
-
- @Before
- public void setUp() throws Exception {
- _rInstance = new Result();
-
- CloudRegion _cloudRegion = mock(CloudRegion.class);
- Complex _complex = mock(Complex.class);
- Configuration _configuration = mock(Configuration.class);
- L3InterfaceIpv4AddressList _l3InterfaceIpv4AddressList = mock(L3InterfaceIpv4AddressList.class);
- L3InterfaceIpv6AddressList _l3InterfaceIpv6AddressList = mock(L3InterfaceIpv6AddressList.class);
- L3Network _l3Network = mock(L3Network.class);
- LInterface _pInterface = mock(LInterface.class);
- GenericVnf _genericVnf = mock(GenericVnf.class);
- Vserver _vserver = mock(Vserver.class);
- Pserver _pserver = mock(Pserver.class);
- Vnfc _vnfc = mock(Vnfc.class);
- ServiceInstance _serviceInstance = mock(ServiceInstance.class);
-
- _additionalProperties = new HashMap<String, Object>() {{
- put("prop1", "propvalue1");
- put("prop2", "propvalue2");
- }};
- }
-
- @After
- public void tearDown() throws Exception {
- _rInstance = null;
- _additionalProperties = null;
- }
-
- @Test
- public void testSetComplex() {
- _rInstance.setComplex(_complex);
- assertEquals(_rInstance.getComplex(), _complex);
- }
-
- @Test
- public void testSetConfiguration() {
- _rInstance.setConfiguration(_configuration);
- assertEquals(_rInstance.getConfiguration(), _configuration);
- }
-
- @Test
- public void testSetL3InterfaceIpv4AddressList() {
- _rInstance.setL3InterfaceIpv4AddressList(_l3InterfaceIpv4AddressList);
- assertEquals(_rInstance.getL3InterfaceIpv4AddressList(), _l3InterfaceIpv4AddressList);
- }
-
- @Test
- public void testSetL3InterfaceIpv6AddressList() {
- _rInstance.setL3InterfaceIpv6AddressList(_l3InterfaceIpv6AddressList);
- assertEquals(_rInstance.getL3InterfaceIpv6AddressList(), _l3InterfaceIpv6AddressList);
- }
-
- @Test
- public void testSetL3Network() {
- _rInstance.setL3Network(_l3Network);
- assertEquals(_rInstance.getL3Network(), _l3Network);
- }
-
- @Test
- public void testSetServiceInstance() {
- _rInstance.setServiceInstance(_serviceInstance);
- assertEquals(_rInstance.getServiceInstance(), _serviceInstance);
- }
-
- @Test
- public void testSetGenericVnf() {
- _rInstance.setGenericVnf(_genericVnf);
- assertEquals(_rInstance.getGenericVnf(), _genericVnf);
- }
-
- @Test
- public void testSetVserver() {
- _rInstance.setVserver(_vserver);
- assertEquals(_rInstance.getVserver(), _vserver);
- }
-
- @Test
- public void testSetCloudRegion() {
- _rInstance.setCloudRegion(_cloudRegion);
- assertEquals(_rInstance.getCloudRegion(), _cloudRegion);
- }
-
- @Test
- public void testSetVnfc() {
- _rInstance.setVnfc(_vnfc);
- assertEquals(_rInstance.getVnfc(), _vnfc);
- }
-
- @Test
- public void testSetLInterface() {
- _rInstance.setLInterface(_lInterface);
- assertEquals(_rInstance.getLInterface(), _lInterface);
- }
-
- @Test
- public void testSetPserver() {
- _rInstance.setPserver(_pserver);
- assertEquals(_rInstance.getPserver(), _pserver);
- }
-
- @Test
- public void testSetAdditionalProperty() {
- _rInstance.setAdditionalProperty("prop1", "propvalue1");
- _rInstance.setAdditionalProperty("prop2", "propvalue2");
- assertEquals(_rInstance.getAdditionalProperties(), _additionalProperties);
- }
-
- @Test
- public void testToString() {
- assertNotNull(_rInstance.toString());
- }
+ Result _rInstance;
+
+ protected CloudRegion _cloudRegion;
+ protected Complex _complex;
+ protected Configuration _configuration;
+ protected GenericVnf _genericVnf;
+ protected L3InterfaceIpv4AddressList _l3InterfaceIpv4AddressList;
+ protected L3InterfaceIpv6AddressList _l3InterfaceIpv6AddressList;
+ protected L3Network _l3Network;
+ protected LInterface _lInterface;
+ protected Pserver _pserver;
+ protected ServiceInstance _serviceInstance;
+ protected Vnfc _vnfc;
+ protected Vserver _vserver;
+
+ protected Map<String, Object> _additionalProperties;
+
+ @Before
+ public void setUp() throws Exception {
+ _rInstance = new Result();
+
+ CloudRegion _cloudRegion = mock(CloudRegion.class);
+ Complex _complex = mock(Complex.class);
+ Configuration _configuration = mock(Configuration.class);
+ L3InterfaceIpv4AddressList _l3InterfaceIpv4AddressList = mock(L3InterfaceIpv4AddressList.class);
+ L3InterfaceIpv6AddressList _l3InterfaceIpv6AddressList = mock(L3InterfaceIpv6AddressList.class);
+ L3Network _l3Network = mock(L3Network.class);
+ LInterface _pInterface = mock(LInterface.class);
+ GenericVnf _genericVnf = mock(GenericVnf.class);
+ Vserver _vserver = mock(Vserver.class);
+ Pserver _pserver = mock(Pserver.class);
+ Vnfc _vnfc = mock(Vnfc.class);
+ ServiceInstance _serviceInstance = mock(ServiceInstance.class);
+
+ _additionalProperties = new HashMap<String, Object>() {{
+ put("prop1", "propvalue1");
+ put("prop2", "propvalue2");
+ }};
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ _rInstance = null;
+ _additionalProperties = null;
+ }
+
+ @Test
+ public void testSetComplex() {
+ _rInstance.setComplex(_complex);
+ assertEquals(_rInstance.getComplex(), _complex);
+ }
+
+ @Test
+ public void testSetConfiguration() {
+ _rInstance.setConfiguration(_configuration);
+ assertEquals(_rInstance.getConfiguration(), _configuration);
+ }
+
+ @Test
+ public void testSetL3InterfaceIpv4AddressList() {
+ _rInstance.setL3InterfaceIpv4AddressList(_l3InterfaceIpv4AddressList);
+ assertEquals(_rInstance.getL3InterfaceIpv4AddressList(), _l3InterfaceIpv4AddressList);
+ }
+
+ @Test
+ public void testSetL3InterfaceIpv6AddressList() {
+ _rInstance.setL3InterfaceIpv6AddressList(_l3InterfaceIpv6AddressList);
+ assertEquals(_rInstance.getL3InterfaceIpv6AddressList(), _l3InterfaceIpv6AddressList);
+ }
+
+ @Test
+ public void testSetL3Network() {
+ _rInstance.setL3Network(_l3Network);
+ assertEquals(_rInstance.getL3Network(), _l3Network);
+ }
+
+ @Test
+ public void testSetServiceInstance() {
+ _rInstance.setServiceInstance(_serviceInstance);
+ assertEquals(_rInstance.getServiceInstance(), _serviceInstance);
+ }
+
+ @Test
+ public void testSetGenericVnf() {
+ _rInstance.setGenericVnf(_genericVnf);
+ assertEquals(_rInstance.getGenericVnf(), _genericVnf);
+ }
+
+ @Test
+ public void testSetVserver() {
+ _rInstance.setVserver(_vserver);
+ assertEquals(_rInstance.getVserver(), _vserver);
+ }
+
+ @Test
+ public void testSetCloudRegion() {
+ _rInstance.setCloudRegion(_cloudRegion);
+ assertEquals(_rInstance.getCloudRegion(), _cloudRegion);
+ }
+
+ @Test
+ public void testSetVnfc() {
+ _rInstance.setVnfc(_vnfc);
+ assertEquals(_rInstance.getVnfc(), _vnfc);
+ }
+
+ @Test
+ public void testSetLInterface() {
+ _rInstance.setLInterface(_lInterface);
+ assertEquals(_rInstance.getLInterface(), _lInterface);
+ }
+
+ @Test
+ public void testSetPserver() {
+ _rInstance.setPserver(_pserver);
+ assertEquals(_rInstance.getPserver(), _pserver);
+ }
+
+ @Test
+ public void testSetAdditionalProperty() {
+ _rInstance.setAdditionalProperty("prop1", "propvalue1");
+ _rInstance.setAdditionalProperty("prop2", "propvalue2");
+ assertEquals(_rInstance.getAdditionalProperties(), _additionalProperties);
+ }
+
+ @Test
+ public void testToString() {
+ assertNotNull(_rInstance.toString());
+ }
}
diff --git a/aai-service/provider/src/test/resources/aaiclient.properties b/aai-service/provider/src/test/resources/aaiclient.properties
index c1ef22214..c84d05d87 100755
--- a/aai-service/provider/src/test/resources/aaiclient.properties
+++ b/aai-service/provider/src/test/resources/aaiclient.properties
@@ -26,210 +26,52 @@
#
# Certificate keystore and truststore
#
-org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/bvc/tls-client/truststore.client.jks
+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.ssl.key=/opt/bvc/tls-client/keystore.client.p12
-org.onap.ccsdk.sli.adaptors.aai.ssl.key.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.openecomp.org:8443
-
-#
connection.timeout=60000
read.timeout=60000
# query
-org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v11/search/sdn-zone-query
-org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v11/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
-org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v11/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
+org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v13/search/sdn-zone-query
+org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v13/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name}
+org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v13/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3
# named query
org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query
-
#update
-org.onap.ccsdk.sli.adaptors.aai.update=/aai/v11/actions/update
-
-# vce
-org.onap.ccsdk.sli.adaptors.aai.path.vce =/aai/v11/network/vces/vce/
-org.onap.ccsdk.sli.adaptors.aai.path.vces=/aai/v11/network/vces/
-
-# customer
-org.onap.ccsdk.sli.adaptors.aai.path.customer=/aai/v11/business/customers/customer/{customer-id}
-
-# service subscription
-org.onap.ccsdk.sli.adaptors.aai.path.service.subscription=/aai/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}
-
-# service instance
-org.onap.ccsdk.sli.adaptors.aai.path.svcinst=/aai/v11/business/customers/customer/{customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances
-org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v11/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/v11/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
-
-# tenant
-org.onap.ccsdk.sli.adaptors.aai.path.tenant=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}
-org.onap.ccsdk.sli.adaptors.aai.path.tenant.query=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant?tenant-name={tenant-name}
-
-# vservers
-org.onap.ccsdk.sli.adaptors.aai.path.vservers=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/
-org.onap.ccsdk.sli.adaptors.aai.path.vserver=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/tenants/tenant/{tenant-id}/vservers/vserver/{vserver-id}
-
-# vpls-pe
-org.onap.ccsdk.sli.adaptors.aai.path.vpls.pes=/aai/v11/network/vpls-pes/
-org.onap.ccsdk.sli.adaptors.aai.path.vpls.pe =/aai/v11/network/vpls-pes/vpls-pe/
-
-# ctag-pool
-org.onap.ccsdk.sli.adaptors.aai.path.ctag.pools=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools
-org.onap.ccsdk.sli.adaptors.aai.path.ctag.pool=/aai/v11/cloud-infrastructure/complexes/complex/{physical-location-id}/ctag-pools/ctag-pool/{target-pe}/{availability-zone-name}
-
-#
-#-------------- 1510 ----------------------
-#
-
-# pservers
-org.onap.ccsdk.sli.adaptors.aai.path.pservers=/aai/v11/cloud-infrastructure/pservers
-org.onap.ccsdk.sli.adaptors.aai.path.pserver=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}
-
-# generic-vnf
-#org.onap.ccsdk.sli.adaptors.aai.path.generic.vnfs=/aai/v11/network/generic-vnfs
-#org.onap.ccsdk.sli.adaptors.aai.path.generic.vnf=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}
+org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update
-# dvs-switch
-org.onap.ccsdk.sli.adaptors.aai.path.dvsswitches=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches
-org.onap.ccsdk.sli.adaptors.aai.path.dvsswitch=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/dvs-switches/dvs-switch/{switch-name}
-
-# L3 Networks
-org.onap.ccsdk.sli.adaptors.aai.path.l3networks=/aai/v11/network/l3-networks
-org.onap.ccsdk.sli.adaptors.aai.path.l3network=/aai/v11/network/l3-networks/l3-network/{network-id}
-org.onap.ccsdk.sli.adaptors.aai.path.l3network.query.name=/aai/v11/network/l3-networks/l3-network?network-name={network-name}
+# UBB Notify
+org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/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/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
-org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
-
-# Physical Link
-org.onap.ccsdk.sli.adaptors.aai.path.physical.links=/aai/v11/network/physical-links
-org.onap.ccsdk.sli.adaptors.aai.path.physical.link=/aai/v11/network/physical-links/physical-link/{link-name}
-
-# VPN Bindings
-org.onap.ccsdk.sli.adaptors.aai.path.vpn.bindings=/aai/v11/network/vpn-bindings/
-org.onap.ccsdk.sli.adaptors.aai.path.vpn.binding=/aai/v11/network/vpn-bindings/vpn-binding/{vpn-id}
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces
+org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name}
# VNF IMAGES
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v11/service-design-and-creation/vnf-images
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v11/service-design-and-creation/vnf-images/vnf-image/{att-uuid}
-org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v11/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
-
-# UBB Notify
-org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v11/actions/notify
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=https://sdncodl.it.us.aic.cip.att.com:8443/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id}
-org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=https://sdncodl-conexus.it.us.02.aic.cip.att.com:8543/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information
-
-# Service
-org.onap.ccsdk.sli.adaptors.aai.path.service=/aai/v11/service-design-and-creation/services/service/{service-id}
-org.onap.ccsdk.sli.adaptors.aai.path.services=/aai/v11/service-design-and-creation/services
-
-
-#
-#-------------- 1604 ----------------------
-#
-
-# VNFC
-org.onap.ccsdk.sli.adaptors.aai.path.vnfc=/aai/v11/network/vnfcs/vnfc/{vnfc-name}
-
-# site-pair
-org.onap.ccsdk.sli.adaptors.aai.path.site.pair=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}/site-pairs/site-pair/{site-pair-id}
-
-# routing-instance
-org.onap.ccsdk.sli.adaptors.aai.path.routing.instance=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}/routing-instances/routing-instance/{routing-instance-id}
-
-# site-pair-set
-org.onap.ccsdk.sli.adaptors.aai.path.site.pair.set=/aai/v11/network/site-pair-sets/site-pair-set/{site-pair-set-id}
-
-# license key resource
-org.onap.ccsdk.sli.adaptors.aai.path.license.acquire=/aai/v11/actions/assignment/license-management/assignment-group-uuid/{assignment-group-uuid}
-org.onap.ccsdk.sli.adaptors.aai.path.license=/aai/v11/license-management/license-key-resources/license-key-resource/{att-uuid}
-
-# logical-link
-org.onap.ccsdk.sli.adaptors.aai.path.logical.link =/aai/v11/network/logical-links/logical-link/{link-name}
-
-# virtual-data-center
-org.onap.ccsdk.sli.adaptors.aai.path.virtual.data.center=/aai/v11/cloud-infrastructure/virtual-data-centers/virtual-data-center/{vdc-id}
-
-# wan-connector
-org.onap.ccsdk.sli.adaptors.aai.path.wan.connector=/aai/v11/business/connectors/connector/{resource-instance-id}
-
-# l-interface
-org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface=/aai/v11/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-
-# l-interface pnf
-org.onap.ccsdk.sli.adaptors.aai.path.lag.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-org.onap.ccsdk.sli.adaptors.aai.path.p.interface.l.interface.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-
-# subinterface
-org.onap.ccsdk.sli.adaptors.aai.path.pnf.lag.interface.subinterface=/aai/v11/network/pnfs/pnf/{pnf-name}/lag-interfaces/lag-interface/{lag-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-org.onap.ccsdk.sli.adaptors.aai.path.pnf.p.interface.l.interface=/aai/v11/network/pnfs/pnf/{pnf-name}/p-interfaces/p-interface/{p-interface.interface-name}/l-interfaces/l-interface/{interface-name}
-
-# l3-interface-ipv4-address-list
-org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-
-# l3-interface-ipv6-address-list
-org.onap.ccsdk.sli.adaptors.aai.path.l3.interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-org.onap.ccsdk.sli.adaptors.aai.path.vlan.l3.interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v13/service-design-and-creation/vnf-images
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v13/service-design-and-creation/vnf-images/vnf-image/{att-uuid}
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
-# ipsec-configuration
-org.onap.ccsdk.sli.adaptors.aai.path.ipsec.configuration=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}
-
-# vig server
-org.onap.ccsdk.sli.adaptors.aai.path.vig.server=/aai/v11/network/ipsec-configurations/ipsec-configuration/{ipsec-configuration-id}/vig-servers/vig-server/{vig-address-type}
-
-# l3-network
-org.onap.ccsdk.sli.adaptors.aai.path.l3.network=/aai/v11/network/l3-networks/l3-network/{network-id}
-
-# subnet
-org.onap.ccsdk.sli.adaptors.aai.path.subnet=/aai/v11/network/l3-networks/l3-network/{network-id}/subnets/subnet/{subnet-id}
-
-# multicast-configuration
-org.onap.ccsdk.sli.adaptors.aai.path.multicast.configuration=/aai/v11/network/multicast-configurations/multicast-configuration/{multicast-configuration-id}
-
-# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv4.address.list
-org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-
-# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.vlan.ipv4.address.list
-org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.vlan.ipv4.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/vlans/vlan/{vlan-interface}/l3-interface-ipv4-address-list/{l3-interface-ipv4-address}
-
-# org.onap.ccsdk.sli.adaptors.aai.path.l.interface.ipv6.address.list
-org.onap.ccsdk.sli.adaptors.aai.path.l3-interface.ipv6.address.list=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/l-interfaces/l-interface/{interface-name}/l3-interface-ipv6-address-list/{l3-interface-ipv6-address}
-
-# volume.group
-org.onap.ccsdk.sli.adaptors.aai.path.volume.group=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/volume-groups/volume-group/{volume-group-id}
-
-#cloud region
-org.onap.ccsdk.sli.adaptors.aai.path.cloud.region=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}
-
-# vf-module
-org.onap.ccsdk.sli.adaptors.aai.path.vf.module=/aai/v11/network/generic-vnfs/generic-vnf/{vnf-id}/vf-modules/vf-module/{vf-module-id}
-
-# network-policy
-org.onap.ccsdk.sli.adaptors.aai.path.network.policy=/aai/v11/network/network-policies/network-policy/{network-policy-id}
-
-# pnf
-org.onap.ccsdk.sli.adaptors.aai.path.pnf=/aai/v11/network/pnfs/pnf/{pnf-name}
-
-# oam-network
-org.onap.ccsdk.sli.adaptors.aai.path.oam.network=/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/{cloud-owner}/{cloud-region-id}/oam-networks/oam-network/{network-uuid}
+# service instance
+org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v13/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/v13/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}
-# route-table-reference
-org.onap.ccsdk.sli.adaptors.aai.path.route.table.reference=/aai/v11/network/route-table-references/route-table-reference/{route-table-reference-id}
+# VNF IMAGES QUERY
+org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor}
#
# Formatting