summaryrefslogtreecommitdiffstats
path: root/aai-service/provider/src/test/java/org
diff options
context:
space:
mode:
Diffstat (limited to 'aai-service/provider/src/test/java/org')
-rwxr-xr-xaai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/AAIServiceTest.java12
-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/SubInterfaceTest.java4
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/InstanceFilterTest.java20
-rw-r--r--aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/query/ResultTest.java26
7 files changed, 34 insertions, 34 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 5be8a73e0..65160b377 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.v13.*;
+import org.onap.aai.inventory.v14.*;
import org.onap.ccsdk.sli.core.sli.SvcLogicException;
import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus;
@@ -76,7 +76,7 @@ public class AAIServiceTest {
// @Test
public void existsGetPserverByCallBackUrl_shouldReturnSuccess() throws MalformedURLException, Exception {
- String key = "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
+ String key = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
String fileLocation = "json/pserverJson.txt";
SvcLogicContext ctx = new SvcLogicContext();
setConnMock();
@@ -93,7 +93,7 @@ public class AAIServiceTest {
// @Test
public void existsGetPserverByCallBackUrl_throwsExceptionAndReturnsFailure()
throws MalformedURLException, Exception {
- String key = "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
+ String key = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
String fileLocation = "json/pserverJson.txt";
SvcLogicContext ctx = new SvcLogicContext();
setConnMock();
@@ -113,7 +113,7 @@ public class AAIServiceTest {
// @Test
public void pserverDataChangeRequestData_shouldSucceed() throws Exception {
String fileLocation = "json/pserverJson.txt";
- String url = "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
+ String url = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
setConnMock();
when(aaiServiceSpy.getConfiguredConnection(new URL(url), HttpMethod.GET)).thenReturn(connMock);
@@ -128,7 +128,7 @@ public class AAIServiceTest {
// @Test
public void pserverDataChangeRequestData_shouldReturnNullFor404() throws Exception {
String fileLocation = "json/pserverJson.txt";
- String url = "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
+ String url = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
setConnMock();
when(aaiServiceSpy.getConfiguredConnection(new URL(url), HttpMethod.GET)).thenReturn(connMock);
@@ -143,7 +143,7 @@ public class AAIServiceTest {
@Test(expected = AAIServiceException.class)
public void dataChangeRequestData_throwsAAIServiceException() throws Exception {
String fileLocation = "json/pserverJson.txt";
- String url = "https://aai.api.simpledemo.openecomp.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
+ String url = "https://aai.api.simpledemo.onap.org:8443/aai/v11/cloud-infrastructure/pservers/pserver/chcil129snd";
setConnMock();
when(aaiServiceSpy.getConfiguredConnection(new URL(url), HttpMethod.GET)).thenReturn(connMock);
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 0e616d576..9e26a26cb 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.v13.GenericVnf;
+import org.onap.aai.inventory.v14.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 eaedf66f6..b7238564b 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.v13.LInterface;
+import org.onap.aai.inventory.v14.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 8ed704d7a..90b3b5fa5 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.v13.GenericVnf;
+import org.onap.aai.inventory.v14.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/SubInterfaceTest.java b/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/data/SubInterfaceTest.java
index 21fc86d12..d3abd675f 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
@@ -10,8 +10,8 @@ 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;
+import org.onap.aai.inventory.v14.RelationshipList;
+import org.onap.aai.inventory.v14.Vlans;
public class SubInterfaceTest {
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 2a115d708..b3b7eed93 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
@@ -9,16 +9,16 @@ import java.util.Map;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-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;
+import org.onap.aai.inventory.v14.CloudRegion;
+import org.onap.aai.inventory.v14.GenericVnf;
+import org.onap.aai.inventory.v14.L3Network;
+import org.onap.aai.inventory.v14.LogicalLink;
+import org.onap.aai.inventory.v14.PInterface;
+import org.onap.aai.inventory.v14.Pnf;
+import org.onap.aai.inventory.v14.ServiceInstance;
+import org.onap.aai.inventory.v14.Tenant;
+import org.onap.aai.inventory.v14.Vnf;
+import org.onap.aai.inventory.v14.Vserver;
public class InstanceFilterTest {
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 576778bb5..3c142606d 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,19 +10,19 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-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;
+import org.onap.aai.inventory.v14.CloudRegion;
+import org.onap.aai.inventory.v14.Complex;
+import org.onap.aai.inventory.v14.Configuration;
+import org.onap.aai.inventory.v14.GenericVnf;
+import org.onap.aai.inventory.v14.L3InterfaceIpv4AddressList;
+import org.onap.aai.inventory.v14.L3InterfaceIpv6AddressList;
+import org.onap.aai.inventory.v14.L3Network;
+import org.onap.aai.inventory.v14.LInterface;
+//import org.onap.aai.inventory.v14.OwningEntity;
+import org.onap.aai.inventory.v14.Pserver;
+import org.onap.aai.inventory.v14.ServiceInstance;
+import org.onap.aai.inventory.v14.Vnfc;
+import org.onap.aai.inventory.v14.Vserver;
public class ResultTest {