diff options
| -rw-r--r-- | aai-service/features/src/main/resources/features.xml | 6 | ||||
| -rwxr-xr-x | pom.xml | 2 | ||||
| -rw-r--r-- | resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java | 23 | ||||
| -rw-r--r-- | sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/ITCaseSqlResource.java (renamed from sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java) | 4 |
4 files changed, 8 insertions, 27 deletions
diff --git a/aai-service/features/src/main/resources/features.xml b/aai-service/features/src/main/resources/features.xml index bd3d0bc1..4baca838 100644 --- a/aai-service/features/src/main/resources/features.xml +++ b/aai-service/features/src/main/resources/features.xml @@ -19,16 +19,16 @@ --> -<features name="ccsdk-aai-service-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" +<features name="sdnc-aai-service-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> - <feature name='ccsdk-aai-service' description="ccsdk-aai-service" version='${project.version}'> + <feature name='sdnc-aai-service' description="sdnc-aai-service" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <feature>ccsdk-sli</feature> + <feature>sdnc-sli</feature> <bundle>mvn:org.onap.ccsdk.sli.adaptors/aai-service-provider/${project.version}</bundle> <bundle>mvn:com.sun.jersey/jersey-client/${jersey.client.version}</bundle> <bundle>mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle> @@ -88,7 +88,7 @@ <artifactId>maven-surefire-plugin</artifactId> <version>2.17</version> <configuration> - <skipTests>true</skipTests> + <skipTests>false</skipTests> </configuration> </plugin> <plugin> diff --git a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java index 5b942342..4dee2d61 100644 --- a/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java +++ b/resource-assignment/provider/src/test/java/jtest/org/onap/ccsdk/sli/adaptors/ra/TestIsAvailable.java @@ -367,25 +367,6 @@ public class TestIsAvailable { public void test011() throws Exception { String t = "011"; log.info("============== isAvailable " + t + " ================================"); - log.info("=== Test input validations - no speed in input"); - - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.resource-allocator.speed-unit", "Gbps"); - ctx.setAttribute("tmp.resource-allocator.aic-site-id", "MTSNJA4LCP1"); - - try { - resourceAllocator.isAvailable("NetworkCapacity", null, null, ctx); - } catch (SvcLogicException e) { - Assert.assertTrue(e.getMessage().equals("tmp.resource-allocator.speed is required in ResourceAllocator")); - return; - } - Assert.fail("SvcLogicException expected"); - } - - @Test - public void test012() throws Exception { - String t = "012"; - log.info("============== isAvailable " + t + " ================================"); log.info("=== Test input validations - speed not a number in input"); SvcLogicContext ctx = new SvcLogicContext(); @@ -403,8 +384,8 @@ public class TestIsAvailable { } @Test - public void test013() throws Exception { - String t = "013"; + public void test012() throws Exception { + String t = "012"; log.info("============== isAvailable " + t + " ================================"); log.info("=== Test input validations - speed-unit missing in input"); diff --git a/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/ITCaseSqlResource.java index 2d48ff3f..f0ab6037 100644 --- a/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/SqlResourceTest.java +++ b/sql-resource/provider/src/test/java/org/onap/ccsdk/sli/adaptors/resource/sql/ITCaseSqlResource.java @@ -34,10 +34,10 @@ import org.slf4j.LoggerFactory; import junit.framework.TestCase; -public class SqlResourceTest extends TestCase { +public class ITCaseSqlResource extends TestCase { private static final Logger LOG = LoggerFactory - .getLogger(SqlResourceTest.class); + .getLogger(ITCaseSqlResource.class); public void testExists() { |