From: Dan Timoney <dtimoney@att.com>
Date: Wed, 20 Dec 2017 19:25:32 +0000 (-0500)
Subject: Resolve duplicate file name
X-Git-Tag: v1.3.1~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=1e8a80e24b62f66e4d1bacf2be475ffb01c78a17

Resolve duplicate file name

Renamed vnfapiProviderTest.java to VnfapiProviderTestBase.java to avoid
conflict with VnfapiProviderTest.java

Change-Id: I500785a038691c17b84faac427232da2f9fdee21
Issue-ID: SDNC-228
Signed-off-by: Dan Timoney <dtimoney@att.com>
---

diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
index 701b5163..7a140323 100644
--- a/generic-resource-api/model/pom.xml
+++ b/generic-resource-api/model/pom.xml
@@ -50,6 +50,7 @@
 			<plugin>
 				<groupId>org.opendaylight.yangtools</groupId>
 				<artifactId>yang-maven-plugin</artifactId>
+                <version>${odl.yangtools.yang.maven.plugin.version}</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.opendaylight.mdsal</groupId>
diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java
similarity index 99%
rename from vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java
rename to vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java
index 88b73e00..f174f7fa 100644
--- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/vnfapiProviderTest.java
+++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfapiProviderTestBase.java
@@ -117,7 +117,7 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-public class vnfapiProviderTest {
+public class VnfapiProviderTestBase {
     @Rule public MockitoRule rule = MockitoJUnit.rule();
 
     @Mock private DataBroker dataBroker;