rename openo to onap

Change-Id: I2cf180595e682becfca5848c704aee406d971337
Issue-ID: VFC-755
Signed-off-by: Zhuoyao Huang <10112215@zte.com.cn>

diff --git a/zte/sfc-driver/plugin-standalone/src/main/assembly/run.sh b/zte/sfc-driver/plugin-standalone/src/main/assembly/run.sh
index ae8318a..5a9ba00 100644 (file)
--- a/zte/sfc-driver/plugin-standalone/src/main/assembly/run.sh
+++ b/zte/sfc-driver/plugin-standalone/src/main/assembly/run.sh
@@ -43,6 +43,6 @@ echo @JAVA_OPTS@ $JAVA_OPTS
 class_path="$RUNHOME/:$RUNHOME/sfc-service.jar"
 echo @class_path@ $class_path
 
-"$JAVA" $JAVA_OPTS -classpath "$class_path"  org.openo.sfc.SfcDriver server "$RUNHOME/conf/console.yml"
+"$JAVA" $JAVA_OPTS -classpath "$class_path"  SfcDriver server "$RUNHOME/conf/console.yml"
 
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriver.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriver.java
similarity index 93%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriver.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriver.java
index b15c000..57e50a5 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriver.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriver.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc;
+package org.onap.sfc;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.dropwizard.Application;
@@ -23,11 +23,11 @@ import io.dropwizard.setup.Bootstrap;
 import io.dropwizard.setup.Environment;
 import io.swagger.jaxrs.config.BeanConfig;
 import io.swagger.jaxrs.listing.ApiListingResource;
-import org.openo.sfc.health.ConsoleHealthCheck;
-import org.openo.sfc.resources.DriverResource;
-import org.openo.sfc.service.ConfigInfo;
-import org.openo.sfc.resources.MsbServiceRegister;
-import org.openo.sfc.utils.SfcConst;
+import org.onap.sfc.utils.SfcConst;
+import org.onap.sfc.health.ConsoleHealthCheck;
+import org.onap.sfc.resources.DriverResource;
+import org.onap.sfc.service.ConfigInfo;
+import org.onap.sfc.resources.MsbServiceRegister;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriverConfig.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriverConfig.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriverConfig.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriverConfig.java
index 16f89ce..c3293ab 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/SfcDriverConfig.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/SfcDriverConfig.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc;
+package org.onap.sfc;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.dropwizard.Configuration;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/ChainParameter.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/ChainParameter.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/ChainParameter.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/ChainParameter.java
index f0efe0f..4b17a41 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/ChainParameter.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/ChainParameter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/DelReqInfo.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/DelReqInfo.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/DelReqInfo.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/DelReqInfo.java
index 94cbf9f..1b7240d 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/DelReqInfo.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/DelReqInfo.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 public class DelReqInfo {
     private String sdnControllerId;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq.java
similarity index 99%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq.java
index 880c82c..daa3923 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq4N.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq4N.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
index 75e94b2..7d1f180 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassfierReq4N.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassfierReq4N.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 public class FlowClassfierReq4N {
     private String url;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassifierReq4S.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassifierReq4S.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassifierReq4S.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassifierReq4S.java
index 587d7a6..4685009 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/FlowClassifierReq4S.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/FlowClassifierReq4S.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/MsbRegisterEntity.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/MsbRegisterEntity.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/MsbRegisterEntity.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/MsbRegisterEntity.java
index 6417b02..9dcd00e 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/MsbRegisterEntity.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/MsbRegisterEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/NodeEntity.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/NodeEntity.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/NodeEntity.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/NodeEntity.java
index bfba99d..493266e 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/NodeEntity.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/NodeEntity.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq.java
index 4dfc9a3..1727008 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4N.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4N.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4N.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4N.java
index 6457d0e..447de12 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4N.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4N.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import java.util.ArrayList;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4S.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4S.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4S.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4S.java
index 05d04c6..8b40b27 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortChainReq4S.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortChainReq4S.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq.java
index 4dff87a..650f119 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4N.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4N.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4N.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4N.java
index 393fe13..e770441 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4N.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4N.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import java.util.List;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4S.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4S.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4S.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4S.java
index c52a3ef..79e3c40 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/PortPairGroupReq4S.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/PortPairGroupReq4S.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/Result.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/Result.java
similarity index 96%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/Result.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/Result.java
index bb4f2ac..14cb73b 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/Result.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/Result.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 public class Result {
     public String getId() {

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/SdnControllerInfo.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/SdnControllerInfo.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/SdnControllerInfo.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/SdnControllerInfo.java
index 733971e..5aee863 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/SdnControllerInfo.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/SdnControllerInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.entity;
+package org.onap.sfc.entity;
 
 public class SdnControllerInfo {
     String url;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortInfo.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortInfo.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortInfo.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortInfo.java
index 996b799..0eda970 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortInfo.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.entity.portpair;
+package org.onap.sfc.entity.portpair;
 
 
 import com.google.gson.annotations.SerializedName;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq.java
index d4766c1..4b8a66c 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity.portpair;
+package org.onap.sfc.entity.portpair;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4N.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4N.java
similarity index 98%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4N.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4N.java
index e4346e5..7651260 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4N.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4N.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity.portpair;
+package org.onap.sfc.entity.portpair;
 
 import java.util.Map;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4S.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4S.java
similarity index 96%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4S.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4S.java
index 6218480..2d6933d 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/PortPairReq4S.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/PortPairReq4S.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity.portpair;
+package org.onap.sfc.entity.portpair;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/ServiceFunctionParameter.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/ServiceFunctionParameter.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/ServiceFunctionParameter.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/ServiceFunctionParameter.java
index c1c384c..28dd1b8 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/entity/portpair/ServiceFunctionParameter.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/entity/portpair/ServiceFunctionParameter.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.entity.portpair;
+package org.onap.sfc.entity.portpair;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/health/ConsoleHealthCheck.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/health/ConsoleHealthCheck.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/health/ConsoleHealthCheck.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/health/ConsoleHealthCheck.java
index 81877a3..737b3d1 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/health/ConsoleHealthCheck.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/health/ConsoleHealthCheck.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.health;
+package org.onap.sfc.health;
 
 import com.codahale.metrics.health.HealthCheck;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/DriverResource.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/DriverResource.java
similarity index 92%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/DriverResource.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/DriverResource.java
index e7b6e86..0c75e31 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/DriverResource.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/DriverResource.java
@@ -13,22 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.resources;
+package org.onap.sfc.resources;
 
 import com.codahale.metrics.annotation.Timed;
-import org.openo.sfc.entity.DelReqInfo;
-import org.openo.sfc.entity.FlowClassfierReq4N;
-import org.openo.sfc.entity.FlowClassifierReq4S;
-import org.openo.sfc.entity.PortChainReq4N;
-import org.openo.sfc.entity.PortChainReq4S;
-import org.openo.sfc.entity.PortPairGroupReq4N;
-import org.openo.sfc.entity.PortPairGroupReq4S;
-import org.openo.sfc.entity.Result;
-import org.openo.sfc.entity.portpair.PortPairReq4N;
-import org.openo.sfc.entity.portpair.PortPairReq4S;
-import org.openo.sfc.service.SdnServiceConsumer;
-import org.openo.sfc.utils.SfcDriverUtil;
-import org.openo.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.FlowClassifierReq4S;
+import org.onap.sfc.entity.PortChainReq4S;
+import org.onap.sfc.entity.PortPairGroupReq4N;
+import org.onap.sfc.entity.PortPairGroupReq4S;
+import org.onap.sfc.entity.portpair.PortPairReq4N;
+import org.onap.sfc.entity.portpair.PortPairReq4S;
+import org.onap.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.DelReqInfo;
+import org.onap.sfc.entity.FlowClassfierReq4N;
+import org.onap.sfc.entity.PortChainReq4N;
+import org.onap.sfc.entity.Result;
+import org.onap.sfc.service.SdnServiceConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/MsbServiceRegister.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/MsbServiceRegister.java
similarity index 89%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/MsbServiceRegister.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/MsbServiceRegister.java
index db98697..8be8bd0 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/resources/MsbServiceRegister.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/resources/MsbServiceRegister.java
@@ -13,13 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.resources;
+package org.onap.sfc.resources;
 
-import com.google.gson.Gson;
-import org.openo.sfc.entity.MsbRegisterEntity;
-import org.openo.sfc.service.ConfigInfo;
-import org.openo.sfc.service.SdnServiceConsumer;
-import org.openo.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.entity.MsbRegisterEntity;
+import org.onap.sfc.service.ConfigInfo;
+import org.onap.sfc.service.SdnServiceConsumer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ConfigInfo.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ConfigInfo.java
similarity index 92%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ConfigInfo.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ConfigInfo.java
index 9d0fee1..7d7a786 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ConfigInfo.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ConfigInfo.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.service;
+package org.onap.sfc.service;
 
-import org.openo.sfc.SfcDriverConfig;
+import org.onap.sfc.SfcDriverConfig;
 
 public class ConfigInfo {
     public static SfcDriverConfig getConfig() {

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ISdnControllerService.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ISdnControllerService.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
index 77d470b..91aad18 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/ISdnControllerService.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/ISdnControllerService.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.service;
+package org.onap.sfc.service;
 
-import org.openo.sfc.entity.Result;
+import org.onap.sfc.entity.Result;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
similarity index 93%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
index 6aaff1f..fae871b 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/MsbService.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/MsbService.java
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.service;
+package org.onap.sfc.service;
 
-import org.openo.sfc.entity.MsbRegisterEntity;
+import org.onap.sfc.entity.MsbRegisterEntity;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/SdnServiceConsumer.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
similarity index 97%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/SdnServiceConsumer.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
index dc59694..c44f9ee 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/service/SdnServiceConsumer.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/service/SdnServiceConsumer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.service;
+package org.onap.sfc.service;
 
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcConst.java
similarity index 96%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcConst.java
index 2ddd5bd..0a4a7e6 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcConst.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcConst.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.utils;
+package org.onap.sfc.utils;
 
 public interface SfcConst {
     public static final int HTTP_OK = 200;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
similarity index 93%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
index 5752092..2b53a53 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/utils/SfcDriverUtil.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/utils/SfcDriverUtil.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.openo.sfc.utils;
+package org.onap.sfc.utils;
 
 import com.google.gson.Gson;
-import org.openo.sfc.entity.ChainParameter;
-import org.openo.sfc.entity.MsbRegisterEntity;
-import org.openo.sfc.entity.NodeEntity;
-import org.openo.sfc.entity.portpair.ServiceFunctionParameter;
+import org.onap.sfc.entity.ChainParameter;
+import org.onap.sfc.entity.MsbRegisterEntity;
+import org.onap.sfc.entity.NodeEntity;
+import org.onap.sfc.entity.portpair.ServiceFunctionParameter;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;

diff --git a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/wrapper/N2sReqWrapper.java b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
similarity index 85%
rename from zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/wrapper/N2sReqWrapper.java
rename to zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
index 0ad7d1b..e378aba 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/main/java/org/openo/sfc/wrapper/N2sReqWrapper.java
+++ b/zte/sfc-driver/sfc-driver/src/main/java/org/onap/sfc/wrapper/N2sReqWrapper.java
@@ -14,23 +14,23 @@
  * limitations under the License.
  */
 
-package org.openo.sfc.wrapper;
+package org.onap.sfc.wrapper;
 
-import org.openo.sfc.entity.ChainParameter;
-import org.openo.sfc.entity.FlowClassfierReq;
-import org.openo.sfc.entity.FlowClassfierReq4N;
-import org.openo.sfc.entity.FlowClassifierReq4S;
-import org.openo.sfc.entity.PortChainReq;
-import org.openo.sfc.entity.PortChainReq4N;
-import org.openo.sfc.entity.PortChainReq4S;
-import org.openo.sfc.entity.PortPairGroupReq;
-import org.openo.sfc.entity.PortPairGroupReq4N;
-import org.openo.sfc.entity.PortPairGroupReq4S;
-import org.openo.sfc.entity.portpair.PortPairReq;
-import org.openo.sfc.entity.portpair.PortPairReq4N;
-import org.openo.sfc.entity.portpair.PortPairReq4S;
-import org.openo.sfc.entity.portpair.ServiceFunctionParameter;
-import org.openo.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.entity.PortChainReq;
+import org.onap.sfc.entity.PortChainReq4S;
+import org.onap.sfc.entity.PortPairGroupReq;
+import org.onap.sfc.entity.PortPairGroupReq4S;
+import org.onap.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.entity.ChainParameter;
+import org.onap.sfc.entity.FlowClassfierReq;
+import org.onap.sfc.entity.FlowClassfierReq4N;
+import org.onap.sfc.entity.FlowClassifierReq4S;
+import org.onap.sfc.entity.PortChainReq4N;
+import org.onap.sfc.entity.PortPairGroupReq4N;
+import org.onap.sfc.entity.portpair.PortPairReq;
+import org.onap.sfc.entity.portpair.PortPairReq4N;
+import org.onap.sfc.entity.portpair.PortPairReq4S;
+import org.onap.sfc.entity.portpair.ServiceFunctionParameter;
 
 import java.util.ArrayList;
 

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestAuthorization.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestAuthorization.java
index 71c1a34..65f2a61 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestAuthorization.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestAuthorization.java
@@ -17,7 +17,7 @@ package org.onap.sfc;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.utils.SfcDriverUtil;
 
 public class TestAuthorization {
     @Test

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestFlowClassifier.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestFlowClassifier.java
index dbe2552..ecaa984 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestFlowClassifier.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestFlowClassifier.java
@@ -17,9 +17,9 @@ package org.onap.sfc;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.sfc.entity.FlowClassfierReq4N;
-import org.openo.sfc.utils.SfcDriverUtil;
-import org.openo.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.FlowClassfierReq4N;
+import org.onap.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.wrapper.N2sReqWrapper;
 
 public class TestFlowClassifier {
 

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestMsbRegister.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestMsbRegister.java
index 1883728..f19d28a 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestMsbRegister.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestMsbRegister.java
@@ -17,8 +17,8 @@ package org.onap.sfc;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.sfc.entity.MsbRegisterEntity;
-import org.openo.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.entity.MsbRegisterEntity;
+import org.onap.sfc.utils.SfcDriverUtil;
 
 public class TestMsbRegister {
     @Test

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortChain.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortChain.java
index 1643067..4c785d6 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortChain.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortChain.java
@@ -17,8 +17,8 @@ package org.onap.sfc;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.sfc.entity.PortChainReq4N;
-import org.openo.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.PortChainReq4N;
+import org.onap.sfc.wrapper.N2sReqWrapper;
 
 public class TestPortChain {
     @Test

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPair.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPair.java
index 060e3a2..f205651 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPair.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPair.java
@@ -19,10 +19,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mockito;
-import org.openo.sfc.entity.portpair.PortPairReq4N;
-import org.openo.sfc.resources.DriverResource;
-import org.openo.sfc.service.ISdnControllerService;
-import org.openo.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.portpair.PortPairReq4N;
+import org.onap.sfc.resources.DriverResource;
+import org.onap.sfc.service.ISdnControllerService;
+import org.onap.sfc.wrapper.N2sReqWrapper;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPairGroup.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPairGroup.java
index bd4caf2..a343952 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPairGroup.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestPortPairGroup.java
@@ -18,9 +18,9 @@ package org.onap.sfc;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.openo.sfc.entity.PortPairGroupReq4N;
-import org.openo.sfc.service.ISdnControllerService;
-import org.openo.sfc.wrapper.N2sReqWrapper;
+import org.onap.sfc.entity.PortPairGroupReq4N;
+import org.onap.sfc.service.ISdnControllerService;
+import org.onap.sfc.wrapper.N2sReqWrapper;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

diff --git a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestSfParams.java b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestSfParams.java
index 0b5b850..0cd07ab 100644 (file)
--- a/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestSfParams.java
+++ b/zte/sfc-driver/sfc-driver/src/test/java/org/onap/sfc/TestSfParams.java
@@ -17,8 +17,8 @@ package org.onap.sfc;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.openo.sfc.entity.ChainParameter;
-import org.openo.sfc.utils.SfcDriverUtil;
+import org.onap.sfc.entity.ChainParameter;
+import org.onap.sfc.utils.SfcDriverUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;