Add deployment part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / adaptor / Driver2CbamRequestConverter.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/com/nokia/vfcadaptor/adaptor/Driver2CbamRequestConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
similarity index 63%
rename from nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/com/nokia/vfcadaptor/adaptor/Driver2CbamRequestConverter.java
rename to nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
index 5a51917..a6dcc0a 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/com/nokia/vfcadaptor/adaptor/Driver2CbamRequestConverter.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
@@ -14,37 +14,39 @@
  * limitations under the License.
  */
 
-package com.nokia.vfcadaptor.adaptor;
+package org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor;
 
 import java.util.ArrayList;
 import java.util.List;
-import org.springframework.stereotype.Component;
 
-import com.nokia.vfcadaptor.cbam.bo.CBAMCreateVnfRequest;
-import com.nokia.vfcadaptor.cbam.bo.CBAMHealVnfRequest;
-import com.nokia.vfcadaptor.cbam.bo.CBAMInstantiateVnfRequest;
-import com.nokia.vfcadaptor.cbam.bo.CBAMScaleVnfRequest;
-import com.nokia.vfcadaptor.cbam.bo.CBAMTerminateVnfRequest;
-import com.nokia.vfcadaptor.cbam.bo.entity.EndpointInfo;
-import com.nokia.vfcadaptor.cbam.bo.entity.ExtVirtualLinkData;
-import com.nokia.vfcadaptor.cbam.bo.entity.OPENSTACK_V3_INFO;
-import com.nokia.vfcadaptor.cbam.bo.entity.OpenStackAccessInfoV3;
-import com.nokia.vfcadaptor.cbam.bo.entity.VimInfo;
-import com.nokia.vfcadaptor.cbam.bo.entity.VimInfoType;
-import com.nokia.vfcadaptor.cbam.bo.entity.VnfExtCpData;
-import com.nokia.vfcadaptor.constant.CommonEnum;
-import com.nokia.vfcadaptor.nslcm.bo.NslcmGrantVnfResponse;
-import com.nokia.vfcadaptor.nslcm.bo.entity.GrantInfo;
-import com.nokia.vfcadaptor.nslcm.bo.entity.VimComputeResourceFlavour;
-import com.nokia.vfcadaptor.vnfmdriver.bo.HealVnfRequest;
-import com.nokia.vfcadaptor.vnfmdriver.bo.InstantiateVnfRequest;
-import com.nokia.vfcadaptor.vnfmdriver.bo.ScaleVnfRequest;
-import com.nokia.vfcadaptor.vnfmdriver.bo.TerminateVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMHealVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMInstantiateVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMScaleVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.EndpointInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtVirtualLinkData;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OPENSTACK_V3_INFO;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OpenStackAccessInfoV3;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfoType;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VnfExtCpData;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfResponse;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.GrantInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimComputeResourceFlavour;
+
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.ScaleVnfRequest;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.TerminateVnfRequest;
+
+import org.springframework.stereotype.Component;
 
 @Component
 public class Driver2CbamRequestConverter {
        
-       public CBAMCreateVnfRequest createrqConvert(InstantiateVnfRequest driverRequest) {
+       public CBAMCreateVnfRequest createReqConvert(InstantiateVnfRequest driverRequest) {
                CBAMCreateVnfRequest request = new CBAMCreateVnfRequest();
 
                request.setVnfdId("vnfd_001");
@@ -53,7 +55,7 @@ public class Driver2CbamRequestConverter {
                return request;
        }
 
-       public CBAMInstantiateVnfRequest InstantiateCqonvert(InstantiateVnfRequest driverRequest,
+       public CBAMInstantiateVnfRequest InstantiateReqConvert(InstantiateVnfRequest driverRequest,
                        NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) {
                CBAMInstantiateVnfRequest request = new CBAMInstantiateVnfRequest();
                List<VimInfo> vims = new ArrayList<VimInfo>();
@@ -90,21 +92,21 @@ public class Driver2CbamRequestConverter {
                return request;
        }
 
-       public CBAMTerminateVnfRequest terminaterqConvert(TerminateVnfRequest driverRequest) {
+       public CBAMTerminateVnfRequest terminateReqConvert(TerminateVnfRequest driverRequest) {
                CBAMTerminateVnfRequest request = new CBAMTerminateVnfRequest();
                request.setTerminationType(driverRequest.getTerminationType());
                request.setGracefulTerminationTimeout(driverRequest.getGracefulTerminationTimeout());
                return request;
        }
 
-       public CBAMHealVnfRequest healconvert(HealVnfRequest driverRequest) {
+       public CBAMHealVnfRequest healReqConvert(HealVnfRequest driverRequest) {
                CBAMHealVnfRequest request = new CBAMHealVnfRequest();
                request.setCause("");
                request.setAdditionalParams("");
                return request;
        }
 
-       public CBAMScaleVnfRequest scaleconvert(ScaleVnfRequest driverRequest) {
+       public CBAMScaleVnfRequest scaleReqconvert(ScaleVnfRequest driverRequest) {
                CBAMScaleVnfRequest request = new CBAMScaleVnfRequest();
                if (driverRequest.getType().equals("SCALE_OUT")) {
                        request.setType(CommonEnum.ScaleDirection.OUT);