From: luxin Date: Fri, 1 Sep 2017 08:53:52 +0000 (+0800) Subject: Fix gvnfm juju compile problem X-Git-Tag: v1.0.0~31^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6921bb94bab037c4396b9c5c42895c0a33b9a7ad;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fgvnfm.git Fix gvnfm juju compile problem Fix gvnfm juju pom file and package name Change-Id: I0a098a366851d65aaeeb37f0af286a41edee39d9 Issue-Id:VFC-229 Signed-off-by: luxin --- diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml index 9c46f98..731f1ad 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/deployment/pom.xml @@ -17,9 +17,9 @@ 4.0.0 - org.openo.nfvo + org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter-service-root - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT juju-vnfmadapterservice-deployment diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml index 3e78def..82f6591 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/pom.xml @@ -17,12 +17,11 @@ 4.0.0 + org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter - org.openo.nfvo - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT juju-vnfmadapter-service-root - 1.1.0-SNAPSHOT nfvo/drivers/vnfm/gvnfm/juju/juju-vnfmadapter/Juju-vnfmadapterService pom diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml index 265f5fb..9a8933c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/pom.xml @@ -17,14 +17,22 @@ 4.0.0 - org.openo.nfvo + org.onap.vfc.nfvo.driver.vnfm.gvnfm juju-vnfmadapter-service-root - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT juju-vnfmadapter-service nfvo/drivers/vnfm/gvnfm/juju/juju-vnfmadapter/Juju-vnfmadapterService/service war + + + + open-o + OPEN-O repository + https://nexus.open-o.org/content/repositories/public/ + + @@ -150,13 +158,13 @@ org.openo.common-services.common-utilities commonlib-cbb - 1.1.0-SNAPSHOT + 2.0.0 org.openo.common-services.common-utilities commonlib-restclient - 1.1.0-SNAPSHOT + 2.0.0 diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallback.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallback.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallback.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallback.java index 2369d18..66db11d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallback.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallback.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback; import org.openo.baseservice.roa.util.restclient.RestfulResponse; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/BaseTimeJob.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/BaseTimeJob.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/BaseTimeJob.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/BaseTimeJob.java index 1698702..8560f37 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/BaseTimeJob.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/BaseTimeJob.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.util.Calendar; import java.util.concurrent.Executors; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtil.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtil.java index 9582f52..087fe9a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManager.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManager.java index dd21809..79f8032 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -37,7 +37,7 @@ import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpGet; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtils.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtils.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtils.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtils.java index 9899c34..6b4c2cb 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtils.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.File; import java.io.InputStream; @@ -24,7 +24,7 @@ import java.util.List; import java.util.concurrent.TimeoutException; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtils.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtils.java similarity index 99% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtils.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtils.java index cb68a5b..926c30d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtils.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.File; import java.io.FileInputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtil.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtil.java index 26ef602..6769369 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.util.ResourceBundle; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtils.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtils.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtils.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtils.java index 31886e4..9cb8833 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtils.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.File; import java.io.InputStream; @@ -23,7 +23,7 @@ import java.util.List; import java.util.concurrent.TimeoutException; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtil.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtil.java index ccfa31a..61807e8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolder.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolder.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolder.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolder.java index 118f3e4..20a76b5 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolder.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtil.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtil.java index 0e819d3..bd23985 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.IOException; import java.io.InputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SwitchController.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SwitchController.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SwitchController.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SwitchController.java index dbcdcf5..325be7a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/SwitchController.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SwitchController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtil.java similarity index 99% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtil.java index eda6b78..f696be0 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtil.java similarity index 99% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtil.java index 57e7202..8b18931 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.IOException; import java.io.InputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmException.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmException.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmException.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmException.java index 3517442..4ba5520 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmException.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtil.java similarity index 87% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtil.java index 9817156..b98571f 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtil.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtil.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtil.java index 52235f2..a1071f1 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.*; import java.util.ArrayList; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java index 1c0da4f..b1cfe36 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.util.HashMap; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java index b1f66e9..26ea627 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.util.HashMap; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java similarity index 99% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java index 238e7ad..1a0fd87 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.util.HashMap; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java index 4e7c13e..24e9adf 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.io.File; import java.io.FileInputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java index b7eee2c..b0c47ef 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.AsyncCallback; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmException; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.Restful; import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback; @@ -29,9 +32,6 @@ import org.openo.baseservice.roa.util.restclient.RestfulFactory; import org.openo.baseservice.roa.util.restclient.RestfulOptions; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.AsyncCallback; -import org.openo.nfvo.jujuvnfmadapter.common.VnfmException; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java index 3e3f793..6aa8798 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; @@ -22,6 +22,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmException; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.Restful; import org.openo.baseservice.roa.util.restclient.RestfulAsyncCallback; @@ -29,9 +32,6 @@ import org.openo.baseservice.roa.util.restclient.RestfulFactory; import org.openo.baseservice.roa.util.restclient.RestfulOptions; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.VnfmException; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java index edbfd05..39b6c6c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokens.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken.module; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.module; import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.jujuvnfmadapter.common.VNFJsonUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VNFJsonUtil; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java index 3013150..ad1d2c7 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessor.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.activator; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.activator; -import org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapterMgrService; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapterMgrService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java index 5dc8184..3086e3f 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import java.io.*; import java.util.ArrayList; @@ -22,14 +22,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.DownloadCsarManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.nfvo.jujuvnfmadapter.common.DownloadCsarManager; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IResourceManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java similarity index 93% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java index a9680ff..6eb5ac4 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2DriverManager.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import net.sf.json.JSONObject; + +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2DriverManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2DriverManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java similarity index 93% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java index 0a96792..99cc2ea 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManager.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import java.util.Map; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2MSBManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2MSBManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java index efd72d6..5bdb9fb 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import java.io.*; import java.util.ArrayList; @@ -23,18 +23,18 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.FileUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.JujuConfigUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.YamlUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils.ExeRes; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuClientManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.JujuHelper; import org.openo.baseservice.roa.util.restclient.RestfulResponse; import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils.ExeRes; -import org.openo.nfvo.jujuvnfmadapter.common.FileUtils; -import org.openo.nfvo.jujuvnfmadapter.common.JujuConfigUtil; -import org.openo.nfvo.jujuvnfmadapter.common.YamlUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuClientManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; -import org.openo.nfvo.jujuvnfmadapter.service.juju.JujuHelper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java index 30f92e4..d786e88 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2DriverManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java index 03a9cf7..d9d8f7c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuAdapter2MSBManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java index fab61a8..11c9474 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IJujuClientManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf; import net.sf.json.JSONObject; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IResourceManager.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IResourceManager.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IResourceManager.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IResourceManager.java index 7c05fd3..84cbf50 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/inf/IResourceManager.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/inf/IResourceManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf; import java.util.Map; import net.sf.json.JSONObject; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java index a297110..0e0c904 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapter2DriverMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.impl; import java.io.BufferedInputStream; import java.io.FileInputStream; @@ -25,12 +25,12 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuAdapter2DriverManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2DriverManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapter2DriverMgrService; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.impl.JujuAdapter2DriverManager; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2DriverManager; -import org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapter2DriverMgrService; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java index 58b9c23..175eada 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.impl; import java.io.BufferedInputStream; import java.io.FileInputStream; @@ -25,12 +25,12 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuAdapter2MSBManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2MSBManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapterMgrService; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; import org.openo.baseservice.util.impl.SystemEnvVariablesFactory; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.impl.JujuAdapter2MSBManager; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuAdapter2MSBManager; -import org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.inf.IJujuAdapterMgrService; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java index ab8b839..f8b0ada 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapter2DriverMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.inf; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java index c3c0f12..fd1e90c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/inf/IJujuAdapterMgrService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.inf; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.inf; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/Constant.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/Constant.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/Constant.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/Constant.java index 0ae5c7f..7d09cce 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/Constant.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/Constant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; import java.util.Arrays; import java.util.Collections; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstants.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstants.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstants.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstants.java index fc734ce..2616b53 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstants.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstants.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstant.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstant.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstant.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstant.java index 1074209..1be2e12 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstant.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstant.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; /** * Url constant class.
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriver.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriver.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriver.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriver.java index d4b4f50..6fe7451 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriver.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.util.List; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfd.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfd.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfd.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfd.java index bab793a..5c0b888 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfd.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfd.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfm.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfm.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfm.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfm.java index 4a15e46..d8969ce 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfm.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.text.SimpleDateFormat; import java.util.Date; @@ -24,8 +24,8 @@ import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.openo.nfvo.jujuvnfmadapter.common.CryptUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfo.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfo.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfo.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfo.java index d3844fa..778290d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfo.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.io.Serializable; import java.util.Date; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java similarity index 99% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java index 560aee8..afc26f7 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExample.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.util.ArrayList; import java.util.Date; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntity.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntity.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntity.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntity.java index 4ac27f2..5845df3 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntity.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.io.Serializable; import java.util.List; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/Vnfm.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/Vnfm.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/Vnfm.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/Vnfm.java index b08b2f5..3b8cb9b 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/Vnfm.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/Vnfm.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.text.SimpleDateFormat; import java.util.Date; @@ -24,8 +24,8 @@ import net.sf.json.JSONObject; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.openo.nfvo.jujuvnfmadapter.common.CryptUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; /** * diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResult.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResult.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResult.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResult.java index 9c3e626..edf92ba 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResult.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResult.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import java.util.ArrayList; import java.util.List; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationException.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationException.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationException.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationException.java index 4d213e5..4defa54 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationException.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.exception; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.exception; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuClientUtils.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuClientUtils.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuClientUtils.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuClientUtils.java index 1e72f04..a6c8f0a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuClientUtils.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuClientUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju; import org.python.core.PyInteger; import org.python.core.PyObject; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuHelper.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuHelper.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuHelper.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuHelper.java index ae0bffa..7791c34 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/JujuHelper.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/JujuHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju; import org.apache.commons.lang3.StringUtils; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/PyObjectFactory.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/PyObjectFactory.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/PyObjectFactory.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/PyObjectFactory.java index 2d98290..35b4793 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/PyObjectFactory.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/PyObjectFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju; import org.python.core.PyObject; import org.python.core.PyString; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Config.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Config.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Config.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Config.java index 21c0cbc..473543a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Config.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Config.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; import java.util.Map; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItem.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItem.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItem.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItem.java index 7edf0b5..14f89b8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItem.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItem.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; /** * Created by QuanZhong on 2016/12/1. diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Options.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Options.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Options.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Options.java index 110b9a2..3bbda77 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/Options.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/Options.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; /** * Created by QuanZhong on 2016/12/1. diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java index 2b2da41..43d771a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/mapper/JujuVnfmInfoMapper.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.mapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgr.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgr.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgr.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgr.java index 8dc6070..4ed3f73 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgr.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgr.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.process; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process; import java.util.Date; import java.util.HashMap; @@ -24,17 +24,17 @@ import java.util.UUID; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.SwitchController; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.SwitchController; -import org.openo.nfvo.jujuvnfmadapter.common.VnfmUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IResourceManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; -import org.openo.nfvo.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgr.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgr.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java index 434817e..d0a1f01 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgr.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgr.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.process; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process; import java.util.List; import java.util.UUID; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.openo.nfvo.jujuvnfmadapter.common.SwitchController; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; -import org.openo.nfvo.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.SwitchController; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; import org.python.jline.internal.Log; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoa.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoa.java similarity index 85% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoa.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoa.java index 38c12fa..267764c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoa.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoa.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import java.io.File; import java.io.IOException; @@ -30,19 +30,19 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.FileUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.JujuConfigUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.SwitchController; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils.ExeRes; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.AdapterResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.FileUtils; -import org.openo.nfvo.jujuvnfmadapter.common.JujuConfigUtil; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils.ExeRes; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.impl.AdapterResourceManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.constant.UrlConstant; -import org.openo.nfvo.jujuvnfmadapter.common.SwitchController; -import org.openo.nfvo.jujuvnfmadapter.common.VnfmUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoa.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoa.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoa.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoa.java index d6e7569..fd918c2 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoa.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoa.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import java.util.UUID; @@ -30,14 +30,14 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.JujuConfigUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuClientManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IJujuClientManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfMgr; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.JujuConfigUtil; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.impl.JujuClientManager; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IJujuClientManager; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfMgr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/SwaggerRoa.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/SwaggerRoa.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/SwaggerRoa.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/SwaggerRoa.java index 06e461a..511d64d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/SwaggerRoa.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/SwaggerRoa.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import java.io.IOException; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoa.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoa.java similarity index 89% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoa.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoa.java index 7510e0e..b148017 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoa.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoa.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; @@ -25,10 +25,10 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfResourceMgr; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfResourceMgr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoa.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoa.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoa.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoa.java index df29ba3..dae8c3c 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoa.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoa.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import java.util.HashMap; import java.util.Map; @@ -34,12 +34,12 @@ import javax.ws.rs.core.MediaType; import org.apache.commons.collections.map.UnmodifiableMap; import org.apache.commons.lang3.StringUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.SwitchController; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfMgr; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.common.SwitchController; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfMgr; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java index 3069c11..bb85d6a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import org.apache.http.HttpStatus; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java similarity index 93% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java index 908a0f1..5ec748d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java index ffddd99..58f9233 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallbackTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallbackTest.java similarity index 84% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallbackTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallbackTest.java index ea01d2b..4a33314 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/AsyncCallbackTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/AsyncCallbackTest.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.AsyncCallback; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.fullstack.JujuClientRoaTest; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.service.rest.fullstack.JujuClientRoaTest; public class AsyncCallbackTest { Logger logger = Logger.getLogger(JujuClientRoaTest.class); diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtilTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtilTest.java index 28350b4..1432d93 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/CryptUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/CryptUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; public class CryptUtilTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManagerTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManagerTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManagerTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManagerTest.java index d4eee79..533e081 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/DownloadCsarManagerTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/DownloadCsarManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.DownloadCsarManager; public class DownloadCsarManagerTest { DownloadCsarManager mgr; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtilsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtilsTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtilsTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtilsTest.java index 0fed60d..41e2803 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/EntityUtilsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/EntityUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -23,7 +23,8 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils.ExeRes; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils.ExeRes; import net.sf.json.JSONObject; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtil.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtil.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtil.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtil.java index 6e03e32..ee8d884 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtil.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtil.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.BufferedReader; import java.io.File; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtilsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtilsTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtilsTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtilsTest.java index d41824c..422888b 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/FileUtilsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/FileUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -24,6 +24,7 @@ import java.util.List; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.FileUtils; public class FileUtilsTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtilTest.java similarity index 89% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtilTest.java index 1175fe8..409a5c2 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/JujuConfigUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/JujuConfigUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.JujuConfigUtil; public class JujuConfigUtilTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtilsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java similarity index 87% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtilsTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java index 61b84d5..4d2e259 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/LocalComandUtilsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/LocalComandUtilsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -23,7 +23,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.LocalComandUtils.ExeRes; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.LocalComandUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.LocalComandUtils.ExeRes; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtilTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtilTest.java index ce6e755..cf2b6f9 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/ResourceUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/ResourceUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.ResourceUtil; public class ResourceUtilTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolderTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java similarity index 89% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolderTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java index 34c8c72..3a96a56 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/SpringContextHolderTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/SpringContextHolderTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.SpringContextHolder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtilTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtilTest.java index ea95a8a..b3f1cfb 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/StringUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/StringUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -26,7 +26,7 @@ import java.lang.reflect.Modifier; import net.sf.json.JSONArray; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; public class StringUtilTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/TestPojo.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/TestPojo.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/TestPojo.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/TestPojo.java index 04c3bcc..e870900 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/TestPojo.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/TestPojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtilTest.java similarity index 93% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtilTest.java index c821cbf..183cc4a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/UnCompressUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/UnCompressUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.FileInputStream; import java.util.ArrayList; @@ -23,6 +23,7 @@ import java.util.List; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.UnCompressUtil; public class UnCompressUtilTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtilTest.java similarity index 98% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtilTest.java index 38aa3b9..278e54a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VNFJsonUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VNFJsonUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; @@ -31,7 +31,7 @@ import net.sf.json.JsonConfig; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.VNFJsonUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VNFJsonUtil; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtilTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtilTest.java index 414218b..0998f05 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/VnfmUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/VnfmUtilTest.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import static org.junit.Assert.*; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtilTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtilTest.java index 193961a..276dbae 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/YamlUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/YamlUtilTest.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common; import java.io.File; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.YamlUtil; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.yaml.snakeyaml.Yaml; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java index 93d715b..bc8f0c1 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestHelpTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -23,8 +23,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.HttpRestHelp; import org.openo.baseservice.roa.util.restclient.Restful; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.HttpRestHelp; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java index 4167c7b..9421805 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/HttpRestfulHelpTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -23,8 +23,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.HttpRestfulHelp; import org.openo.baseservice.roa.util.restclient.Restful; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.HttpRestfulHelp; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java index 0c34643..2517a69 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/JujuVnfmRestfulUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.*; @@ -24,11 +24,12 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VNFRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VNFRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java index 23ed850..3d3e34b 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFAuthConfigInfoTest.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VNFAuthConfigInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VNFAuthConfigInfo; /** *
diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java index 37c6c0b..d7db349 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VNFRestfulUtilTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,8 +27,9 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VNFRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import net.sf.json.JSONObject; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java index f0123ed..c5bc4a0 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/VnfmRestfulUtilTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,8 +26,9 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java index f033984..9608e78 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/AccessTokensTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken.module; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.module; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue; import net.sf.json.JSONObject; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.module.AccessTokens; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.module.AccessTokens; public class AccessTokensTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java similarity index 90% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java index afb0f91..6970452 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/common/servicetoken/module/ServiceTokenHelpTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.common.servicetoken.module; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.module; import org.junit.Test; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java similarity index 86% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java index ad379ae..fc158a6 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/activator/ROAJujuServicePostProcessorTest.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.activator; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.activator; import static org.junit.Assert.*; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.activator.ROAJujuServicePostProcessor; public class ROAJujuServicePostProcessorTest { ROAJujuServicePostProcessor postprocessor=new ROAJujuServicePostProcessor(); diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java index d4e6eba..8100f24 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/AdapterResourceManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import static org.junit.Assert.assertTrue; @@ -22,11 +22,12 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.AdapterResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.HttpRest; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java index 5814a18..4d65f23 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuAdapter2MSBManagerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import static org.junit.Assert.*; @@ -25,12 +25,13 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuAdapter2MSBManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.HttpRest; import org.openo.baseservice.roa.util.restclient.RestfulParametes; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.JujuVnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java index 8fc108c..0aef01f 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/JujuClientManagerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import static org.junit.Assert.assertTrue; @@ -21,6 +21,7 @@ import java.io.IOException; import org.junit.Ignore; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuClientManager; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java index da75931..66f8dbc 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/adapter/impl/ProcessMockImpl.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.adapter.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java similarity index 81% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java index e2ef790..aa5ec0e 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/api/internalsvc/impl/JujuAdapterMgrServiceTest.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.api.internalsvc.impl; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.impl; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.api.internalsvc.impl.JujuAdapterMgrService; public class JujuAdapterMgrServiceTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ConstantTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ConstantTest.java similarity index 85% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ConstantTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ConstantTest.java index dff3c2b..91d516e 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ConstantTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ConstantTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; import static org.junit.Assert.*; @@ -21,7 +21,8 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant.AuthenticationMode; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant.AuthenticationMode; public class ConstantTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstantsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstantsTest.java similarity index 87% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstantsTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstantsTest.java index 2ef3dea..e19b057 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/ParamConstantsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/ParamConstantsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.ParamConstants; public class ParamConstantsTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstantTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstantTest.java similarity index 87% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstantTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstantTest.java index 4e6b1ac..78f3864 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/constant/UrlConstantTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/constant/UrlConstantTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.constant; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Modifier; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.UrlConstant; public class UrlConstantTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriverTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriverTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriverTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriverTest.java index cfef8bf..1087363 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuDriverTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuDriverTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -25,9 +25,10 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.CryptUtil; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuDriver; -import org.openo.nfvo.jujuvnfmadapter.service.entity.VnfmOpResult; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuDriver; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfd; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.VnfmOpResult; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfdTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfdTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfdTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfdTest.java index b01e6c5..65ef48e 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfdTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfdTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,6 +22,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuDriver; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfd; public class JujuVnfdTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java index bf5f464..23b2418 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoExampleTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.*; @@ -22,8 +22,9 @@ import java.util.Date; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criteria; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criterion; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criteria; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criterion; public class JujuVnfmInfoExampleTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java index 6707a3d..b9ed64f 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmInfoTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; @@ -23,6 +23,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; import java.util.Date; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmTest.java similarity index 97% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmTest.java index 744aeef..854da02 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/JujuVnfmTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/JujuVnfmTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.CryptUtil; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfm; -import org.openo.nfvo.jujuvnfmadapter.service.entity.VnfmOpResult; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfm; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.VnfmOpResult; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java index 2f3ec92..29c7c3a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/MSBRequestEntityTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; @@ -21,7 +21,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.service.entity.MSBRequestEntity.Node; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.MSBRequestEntity; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.MSBRequestEntity.Node; public class MSBRequestEntityTest { MSBRequestEntity msbRequestEntity = new MSBRequestEntity(); diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResultTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResultTest.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResultTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResultTest.java index 5089682..ad4e995 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmOpResultTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmOpResultTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.service.entity.VnfmOpResult; -import org.openo.nfvo.jujuvnfmadapter.service.entity.VnfmOpResult.TaskStatus; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.VnfmOpResult; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.VnfmOpResult.TaskStatus; public class VnfmOpResultTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmTest.java index 5eaf230..87ce89b 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/entity/VnfmTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/entity/VnfmTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.entity; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.CryptUtil; -import org.openo.nfvo.jujuvnfmadapter.service.entity.Vnfm; -import org.openo.nfvo.jujuvnfmadapter.service.entity.VnfmOpResult; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.CryptUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.Vnfm; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.VnfmOpResult; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java similarity index 84% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java index 6baaf57..dcd72f8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/exception/UnsupportedOperationExceptionTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.exception; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.exception; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.exception.UnsupportedOperationException; public class UnsupportedOperationExceptionTest { UnsupportedOperationException mess; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItemTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItemTest.java similarity index 89% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItemTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItemTest.java index 84dc214..f215d21 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigItemTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigItemTest.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; import static org.junit.Assert.*; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config.ConfigItem; public class ConfigItemTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigTest.java similarity index 82% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigTest.java index ee3faee..5e70141 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/ConfigTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/ConfigTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; import static org.junit.Assert.*; @@ -22,6 +22,8 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config.Config; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config.ConfigItem; public class ConfigTest { @Test diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/OptionsTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/OptionsTest.java similarity index 84% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/OptionsTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/OptionsTest.java index 76e5b3e..41557e7 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/juju/config/OptionsTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/juju/config/OptionsTest.java @@ -13,11 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.juju.config; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config; import static org.junit.Assert.*; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.juju.config.Options; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgrTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgrTest.java similarity index 96% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgrTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgrTest.java index 1a9ae6e..8c1c403 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfMgrTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfMgrTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.process; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process; import static org.junit.Assert.*; @@ -22,11 +22,12 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.VnfmUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfMgr; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.VnfmUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IResourceManager; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgrTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgrTest.java similarity index 76% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgrTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgrTest.java index 013ecd7..227a929 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/process/VnfResourceMgrTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/process/VnfResourceMgrTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.process; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,13 +25,14 @@ import java.util.List; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.constant.Constant; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criteria; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criterion; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfResourceMgr; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.service.constant.Constant; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criteria; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfoExample.Criterion; -import org.openo.nfvo.jujuvnfmadapter.service.mapper.JujuVnfmInfoMapper; import mockit.Expectations; import mockit.Mock; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoaTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoaTest.java similarity index 89% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoaTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoaTest.java index 53893a5..fc88aac 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/ConfigRoaTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/ConfigRoaTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import static org.junit.Assert.*; @@ -22,10 +22,11 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.JujuConfigUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.ConfigRoa; import org.openo.baseservice.remoteservice.exception.ServiceException; import org.openo.baseservice.roa.util.restclient.RestfulResponse; -import org.openo.nfvo.jujuvnfmadapter.common.JujuConfigUtil; -import org.openo.nfvo.jujuvnfmadapter.common.servicetoken.VnfmRestfulUtil; import org.springframework.mock.web.MockHttpServletResponse; import mockit.Mock; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoaTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoaTest.java similarity index 92% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoaTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoaTest.java index 4f02669..075a3e8 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/JujuClientRoaTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/JujuClientRoaTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import static org.junit.Assert.assertNotNull; @@ -22,10 +22,11 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.impl.JujuClientManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfMgr; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.JujuClientRoa; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.impl.JujuClientManager; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfMgr; import org.springframework.mock.web.MockHttpServletResponse; import mockit.Mock; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/TestMockUp.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/TestMockUp.java similarity index 86% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/TestMockUp.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/TestMockUp.java index 0fd6300..dd9f9a1 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/TestMockUp.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/TestMockUp.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.ConfigRoa; import mockit.Mock; import mockit.MockUp; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java similarity index 85% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java index 4732233..8cdca75 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfResourceRoaTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import static org.junit.Assert.*; @@ -22,9 +22,10 @@ import javax.servlet.http.HttpServletResponse; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfResourceMgr; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.VnfResourceRoa; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfResourceMgr; import org.springframework.mock.web.MockHttpServletResponse; import mockit.Mock; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoaTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoaTest.java similarity index 95% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoaTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoaTest.java index e88054f..bdb6788 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/VnfRoaTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/VnfRoaTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest; import static org.junit.Assert.*; @@ -24,10 +24,11 @@ import javax.ws.rs.core.Context; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.StringUtil; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.entity.JujuVnfmInfo; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.process.VnfMgr; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.VnfRoa; import org.openo.baseservice.remoteservice.exception.ServiceException; -import org.openo.nfvo.jujuvnfmadapter.common.StringUtil; -import org.openo.nfvo.jujuvnfmadapter.service.entity.JujuVnfmInfo; -import org.openo.nfvo.jujuvnfmadapter.service.process.VnfMgr; import org.springframework.mock.web.MockHttpServletResponse; import mockit.Mock; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java similarity index 87% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java index 1b497bf..7ebce2d 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ExceptionMessageTest.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper.ExceptionMessage; public class ExceptionMessageTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java similarity index 85% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java index 9582f9d..afea2b3 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/GenericExceptionMapperTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import javax.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper.GenericExceptionMapper; public class GenericExceptionMapperTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java similarity index 86% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java index 14c027a..fde2d68 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/exceptionmapper/ServiceExceptionMapperTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.exceptionmapper; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper; import static org.junit.Assert.*; @@ -21,6 +21,7 @@ import javax.ws.rs.core.Response; import org.junit.Before; import org.junit.Test; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.exceptionmapper.ServiceExceptionMapper; import org.openo.baseservice.remoteservice.exception.ServiceException; public class ServiceExceptionMapperTest { diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java similarity index 91% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java index 959f374..0f95c1a 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/JujuClientRoaTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.fullstack; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.fullstack; import java.util.List; @@ -22,15 +22,15 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils; import org.apache.log4j.Logger; import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.openo.nfvo.jujuvnfmadapter.common.EntityUtils.ExeRes; -import org.openo.nfvo.jujuvnfmadapter.service.adapter.inf.IResourceManager; -import org.openo.nfvo.jujuvnfmadapter.service.rest.JujuClientRoa; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.EntityUtils.ExeRes; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.adapter.inf.IResourceManager; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.JujuClientRoa; import org.python.jline.internal.Log; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/TestHelper.java b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/TestHelper.java similarity index 94% rename from juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/TestHelper.java rename to juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/TestHelper.java index cf8bc30..f091bbf 100644 --- a/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/openo/nfvo/jujuvnfmadapter/service/rest/fullstack/TestHelper.java +++ b/juju/juju-vnfmadapter/Juju-vnfmadapterService/service/src/test/java/org/onap/vfc/nfvo/vnfm/gvnfm/jujuvnfmadapter/service/rest/fullstack/TestHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openo.nfvo.jujuvnfmadapter.service.rest.fullstack; +package org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.service.rest.fullstack; import java.io.File; import java.io.FileInputStream; @@ -23,7 +23,7 @@ import java.io.IOException; import java.io.InputStream; import org.apache.commons.io.IOUtils; -import org.openo.nfvo.jujuvnfmadapter.common.FileUtils; +import org.onap.vfc.nfvo.vnfm.gvnfm.jujuvnfmadapter.common.FileUtils; import org.springframework.mock.web.MockHttpServletRequest; /** diff --git a/juju/juju-vnfmadapter/pom.xml b/juju/juju-vnfmadapter/pom.xml index 8f54789..40f8a26 100644 --- a/juju/juju-vnfmadapter/pom.xml +++ b/juju/juju-vnfmadapter/pom.xml @@ -16,14 +16,14 @@ --> - org.openo.nfvo - nfvo-root - 1.1.0-SNAPSHOT + org.onap.oparent + oparent + 1.0.0-SNAPSHOT + org.onap.vfc.nfvo.driver.vnfm.gvnfm 4.0.0 - org.openo.nfvo juju-vnfmadapter - 1.1.0-SNAPSHOT + 1.0.0-SNAPSHOT pom nfvo/drivers/vnfm/gvnfm/juju/juju-vnfmadapter nfvo juju-vnfmadapter