diff options
Diffstat (limited to 'adapters/mso-vfc-adapter/src/main')
89 files changed, 0 insertions, 7497 deletions
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java deleted file mode 100644 index dd875c573e..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/CXFConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc; - -import java.util.Arrays; -import org.apache.cxf.Bus; -import org.apache.cxf.endpoint.Server; -import org.apache.cxf.feature.LoggingFeature; -import org.apache.cxf.jaxrs.JAXRSServerFactoryBean; -import org.apache.cxf.jaxrs.swagger.Swagger2Feature; -import org.apache.cxf.transport.servlet.CXFServlet; -import org.onap.so.adapters.vfc.rest.VfcAdapterRest; -import org.onap.so.logging.jaxrs.filter.SOAuditLogContainerFilter; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.web.servlet.ServletRegistrationBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - - -@Configuration -public class CXFConfiguration { - - @Autowired - private Bus bus; - - @Autowired - private VfcAdapterRest vfcAdapterRest; - - @Autowired - private SOAuditLogContainerFilter soAuditLogContainerFilter; - - @Autowired - private ObjectMapper mapper; - - @Bean - public ServletRegistrationBean cxfServlet() { - return new ServletRegistrationBean(new CXFServlet(), "/services/*"); - } - - @Bean - public Server rsServer() { - JAXRSServerFactoryBean endpoint = new JAXRSServerFactoryBean(); - endpoint.setBus(bus); - endpoint.setServiceBeans(Arrays.<Object>asList(vfcAdapterRest)); - endpoint.setAddress("/"); - endpoint.setFeatures(Arrays.asList(createSwaggerFeature(), new LoggingFeature())); - endpoint.setProviders(Arrays.asList(new JacksonJsonProvider(mapper), soAuditLogContainerFilter)); - return endpoint.create(); - } - - @Bean - public Swagger2Feature createSwaggerFeature() { - Swagger2Feature swagger2Feature = new Swagger2Feature(); - swagger2Feature.setPrettyPrint(true); - swagger2Feature.setTitle("SO VFC Adapter"); - swagger2Feature.setContact("The ONAP SO team"); - swagger2Feature.setDescription("This project is the SO Orchestration Engine"); - swagger2Feature.setVersion("1.0.0"); - swagger2Feature.setResourcePackage("org.onap.so.adapters.vfc.rest"); - swagger2Feature.setScan(true); - return swagger2Feature; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java deleted file mode 100644 index 62234f910d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/MSOVfcApplication.java +++ /dev/null @@ -1,37 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2018 IBM. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc; - - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - - - -@SpringBootApplication(scanBasePackages = {"org.onap.so"}) -public class MSOVfcApplication { - - public static void main(String... args) { - SpringApplication.run(MSOVfcApplication.class, args); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java deleted file mode 100644 index d7397c8df3..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/RequestDBConfig.java +++ /dev/null @@ -1,69 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc; - - -import javax.persistence.EntityManagerFactory; -import javax.sql.DataSource; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.boot.jdbc.DataSourceBuilder; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Primary; -import org.springframework.context.annotation.Profile; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.EnableTransactionManagement; - -@Profile({"!test"}) -@Configuration -@EnableTransactionManagement -@EnableJpaRepositories(entityManagerFactoryRef = "requestEntityManagerFactory", - transactionManagerRef = "requestTransactionManager", basePackages = {"org.onap.so.db.request.data.repository"}) -public class RequestDBConfig { - - @Primary - @Bean(name = "requestDataSource") - @ConfigurationProperties(prefix = "spring.datasource") - public DataSource dataSource() { - return DataSourceBuilder.create().build(); - } - - @Primary - @Bean(name = "requestEntityManagerFactory") - public LocalContainerEntityManagerFactoryBean entityManagerFactory(EntityManagerFactoryBuilder builder, - @Qualifier("requestDataSource") DataSource dataSource) { - return builder.dataSource(dataSource).packages("org.onap.so.db.request.beans").persistenceUnit("requestDB") - .build(); - } - - @Primary - @Bean(name = "requestTransactionManager") - public PlatformTransactionManager transactionManager( - @Qualifier("requestEntityManagerFactory") EntityManagerFactory entityManagerFactory) { - return new JpaTransactionManager(entityManagerFactory); - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java deleted file mode 100644 index 51a0fc0c97..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/CommonConstant.java +++ /dev/null @@ -1,157 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.constant; - -/** - * CommonConstant <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -public class CommonConstant { - - public static final String STR_EMPTY = ""; - - public static final String NFVO_CREATE_URL = "/api/nslcm/v1/ns"; - public static final String SOL005_NFVO_CREATE_URL = "/api/nslcm/v1/ns_instances"; - - public static final String NFVO_INSTANTIATE_URL = "/api/nslcm/v1/ns/%s/instantiate"; - public static final String SOL005_NFVO_INSTANTIATE_URL = "/api/nslcm/v1/ns_instances/%s/instantiate"; - - public static final String NFVO_TERMINATE_URL = "/api/nslcm/v1/ns/%s/terminate"; - public static final String SOL005_NFVO_TERMINATE_URL = "/api/nslcm/v1/ns_instances/%s/terminate"; - - public static final String NFVO_DELETE_URL = "/api/nslcm/v1/ns/%s"; - public static final String SOL005_NFVO_DELETE_URL = "/api/nslcm/v1/ns_instances/%s"; - - public static final String NFVO_QUERY_URL = "/api/nslcm/v1/jobs/%s"; - public static final String SOL005_NFVO_QUERY_URL = "/api/nslcm/v1/ns_lcm_op_occs/%s"; - - public static final String NFVO_SCALE_URL = "/api/nslcm/v1/ns/%s/scale"; - - public enum operationState { - PROCESSING, COMPLETED, PARTIALLY_COMPLETED, FAILED_TEMP, FAILED, ROLLING_BACK, ROLLED_BACK - } - public enum lcmOperationType { - INSTANTIATE, SCALE, UPDATE, TERMINATE, HEAL - }; - public enum cancelMode { - GRACEFUL, FORCEFUL - }; - - /** - * - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ - public static class MethodType { - - public static final String POST = "post"; - - public static final String DELETE = "delete"; - - public static final String PUT = "put"; - - public static final String GET = "get"; - - private MethodType() { - - } - } - - /** - * - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ - public static class Step { - - public static final String CREATE = "create"; - - public static final String INSTANTIATE = "instantiate"; - - public static final String STATUS = "status"; - - public static final String TERMINATE = "terminate"; - - public static final String QUERY = "query"; - - public static final String DELETE = "delete"; - - public static final String SCALE = "scale"; - - private Step() { - - } - - } - - - public static final String NSD_ID = "nsdId"; - - public static final String NS_NAME = "nsName"; - - public static final String DESC = "description"; - - public static final String NS_INSTANCE_ID = "nsInstanceId"; - public static final String SOL005_NS_INSTANCE_ID = "id"; - - - public static final String JOB_ID = "jobId"; - public static final String JOB_URI = "Location"; - - public static final String ADDITIONAL_PARAM_FOR_NS = "additionalParamForNs"; - - public static final String LOCAL_HOST = "localhost"; - - public static class StatusDesc { - - public static final String INSTANTIATE_NS_FAILED = "instantiate ns failed"; - - public static final String QUERY_JOB_STATUS_FAILED = "query job status failed"; - - public static final String TERMINATE_NS_FAILED = "terminate ns failed"; - - public static final String DELETE_NS_FAILED = "delete ns failed"; - - public static final String CREATE_NS_FAILED = "create ns failed"; - - public static final String SCALE_NS_FAILED = "scale ns failed"; - - private StatusDesc() { - - } - } - - private CommonConstant() { - - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java deleted file mode 100644 index 61330027c5..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/DriverExceptionID.java +++ /dev/null @@ -1,62 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.constant; - -/** - * <br> - * <p> - * </p> - * identification of adapter exception - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class DriverExceptionID { - - public static final String INVALID_RESPONSE_FROM_INSTANTIATE_OPERATION = - "Invalid response from instantiate operation"; - - public static final String INVALID_RESPONSEE_FROM_CREATE_OPERATION = "Invalid response from create operation"; - - public static final String FAIL_TO_INSTANTIATE_NS = "Fail to instantiate ns"; - - public static final String FAIL_TO_CREATE_NS = "Fail to create ns"; - - public static final String INVALID_RESPONSE_FROM_TERMINATE_OPERATION = "Invalid response from terminate operation"; - - public static final String FAIL_TO_DELETE_NS = "Fail to delete ns"; - - public static final String FAIL_TO_TERMINATE_NS = "Fail to terminate ns"; - - public static final String JOB_STATUS_ERROR = "Job status error"; - - public static final String FAIL_TO_QUERY_JOB_STATUS = "Fail to query job status"; - - public static final String FAIL_TO_SCALE_NS = "Fail to scale network service"; - - public static final String INVALID_RESPONSE_FROM_SCALE_OPERATION = "Invalid response from scale operation"; - - - private DriverExceptionID() { - - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java deleted file mode 100644 index e08c1573cc..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/constant/HttpCode.java +++ /dev/null @@ -1,92 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.constant; - -/** - * Constant Class.<br/> - * <p> - * Define constant for http operation. - * </p> - * - * @author - * @version ONAP Amsterdam 2016/8/4 - */ -public class HttpCode { - - /** - * Fail to request. - */ - public static final int BAD_REQUEST = 400; - - /** - * Inner error - */ - public static final int INTERNAL_SERVER_ERROR = 500; - - /** - * Not accept request. - */ - public static final int NOT_ACCEPTABLE = 406; - - /** - * Not found service. - */ - public static final int NOT_FOUND = 404; - - /** - * Accept request. - */ - public static final int RESPOND_ACCEPTED = 202; - - /** - * Http response is ok. - */ - public static final int RESPOND_OK = 200; - - public static final int CREATED_OK = 201; - - /** - * Conflict - */ - public static final int RESPOND_CONFLICT = 409; - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since ONAP Amsterdam Release 2017-9-6 - */ - private HttpCode() { - - } - - /** - * Whether request is successful.<br/> - * - * @param httpCode response code - * @return true or false - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static boolean isSucess(int httpCode) { - return httpCode / 100 == 2; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java deleted file mode 100644 index 88260a7100..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/exceptions/ApplicationException.java +++ /dev/null @@ -1,75 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.exceptions; - -import javax.ws.rs.core.Response; - -public class ApplicationException extends Exception { - - /** - * Serial number. - */ - private static final long serialVersionUID = 1L; - - private int errorCode; - - private String errorMsg; - - /** - * Constructor<br/> - * <p> - * </p> - * - * @param errorCode error status - * @param errorMsg error detail - * @since ONAP Amsterdam Release 2017-9-6 - */ - public ApplicationException(int errorCode, String errorMsg) { - this.errorCode = errorCode; - this.errorMsg = errorMsg; - } - - public int getErrorCode() { - return errorCode; - } - - public void setErrorCode(int errorCode) { - this.errorCode = errorCode; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - /** - * build error Response <br> - * - * @return - * @since ONAP Amsterdam Release - */ - public Response buildErrorResponse() { - return Response.status(errorCode).entity(errorMsg).build(); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java deleted file mode 100644 index d312501fd7..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddPnfData.java +++ /dev/null @@ -1,68 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class AddPnfData { - private String pnfId; - private String pnfName; - private String pnfdId; - private String pnfProfileId; - private List<PnfExtCpData> cpData; - - /*** - * - * @return id of pnf - */ - public String getPnfId() { - return pnfId; - } - - public void setPnfId(String pnfId) { - this.pnfId = pnfId; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - public String getPnfdId() { - return pnfdId; - } - - public void setPnfdId(String pnfdId) { - this.pnfdId = pnfdId; - } - - public String getPnfProfileId() { - return pnfProfileId; - } - - public void setPnfProfileId(String pnfProfileId) { - this.pnfProfileId = pnfProfileId; - } - - public List<PnfExtCpData> getCpData() { - return cpData; - } - - public void setCpData(List<PnfExtCpData> cpData) { - this.cpData = cpData; - } -} - diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java deleted file mode 100644 index 9f357a549d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AddressRange.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AddressRange { - private String minAddress; - private String maxAddress; - - public String getMinAddress() { - return minAddress; - } - - public void setMinAddress(String minAddress) { - this.minAddress = minAddress; - } - - public String getMaxAddress() { - return maxAddress; - } - - public void setMaxAddress(String maxAddress) { - this.maxAddress = maxAddress; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java deleted file mode 100644 index fa502f3962..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedNs.java +++ /dev/null @@ -1,40 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedNs { - private String nsInstanceId; - private String nsdId; - - private enum changeType { - ADD, REMOVE, INSTANTIATE, TERMINATE, SCALE, UPDATE, HEAL - } - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED, PARTIALLY_COMPLETED - } - - public String getNsInstanceId() { - return nsInstanceId; - } - - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - - public String getNsdId() { - return nsdId; - } - - public void setNsdId(String nsdId) { - this.nsdId = nsdId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java deleted file mode 100644 index 9d98e1c256..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedPnf.java +++ /dev/null @@ -1,67 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedPnf { - private String pnfid; - private String pnfdid; - private String pnfProfileId; - private String pnfName; - private String cpInstanceId; - - private enum changeType { - ADD, REMOVE, MODIFY - } - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED - } - - public String getPnfid() { - return pnfid; - } - - public void setPnfid(String pnfid) { - this.pnfid = pnfid; - } - - public String getPnfdid() { - return pnfdid; - } - - public void setPnfdid(String pnfdid) { - this.pnfdid = pnfdid; - } - - public String getPnfProfileId() { - return pnfProfileId; - } - - public void setPnfProfileId(String pnfProfileId) { - this.pnfProfileId = pnfProfileId; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - public String getCpInstanceId() { - return cpInstanceId; - } - - public void setCpInstanceId(String cpInstanceId) { - this.cpInstanceId = cpInstanceId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java deleted file mode 100644 index 62f4f92fa9..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedSap.java +++ /dev/null @@ -1,49 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedSap { - private String sapInstanceId; - private String sapdId; - private String sapName; - - private enum changeType { - ADD, REMOVE, MODIFY - } - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED - } - - public String getSapInstanceId() { - return sapInstanceId; - } - - public void setSapInstanceId(String sapInstanceId) { - this.sapInstanceId = sapInstanceId; - } - - public String getSapdId() { - return sapdId; - } - - public void setSapdId(String sapdId) { - this.sapdId = sapdId; - } - - public String getSapName() { - return sapName; - } - - public void setSapName(String sapName) { - this.sapName = sapName; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java deleted file mode 100644 index ecaa1c5d3b..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVirtualLink.java +++ /dev/null @@ -1,49 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedVirtualLink { - private String nsVirtualLinkInstanceId; - private String nsVirtualLinkDescId; - private String vlProfileId; - - private enum changeType { - ADD, DELETE, MODIFY, ADD_LINK_PORT, REMOVE_LINK_PORT - }; - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED - } - - public String getNsVirtualLinkInstanceId() { - return nsVirtualLinkInstanceId; - } - - public void setNsVirtualLinkInstanceId(String nsVirtualLinkInstanceId) { - this.nsVirtualLinkInstanceId = nsVirtualLinkInstanceId; - } - - public String getNsVirtualLinkDescId() { - return nsVirtualLinkDescId; - } - - public void setNsVirtualLinkDescId(String nsVirtualLinkDescId) { - this.nsVirtualLinkDescId = nsVirtualLinkDescId; - } - - public String getVlProfileId() { - return vlProfileId; - } - - public void setVlProfileId(String vlProfileId) { - this.vlProfileId = vlProfileId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java deleted file mode 100644 index 6463c7a129..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnf.java +++ /dev/null @@ -1,78 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedVnf { - private String vnfInstanceId; - private String vnfdId; - private String vnfProfileId; - private String vnfName; - - private enum changeType { - ADD, - REMOVE, - INSTANTIATE, - TERMINATE, - SCALE, - CHANGE_FLAVOUR, - HEAL, - OPERATE, - MODIFY_INFORMATION, - CHANGE_EXTERNAL_VNF_CONNECTIVITY - }; - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED - } - - private ChangedInfo changedInfo; - - - public String getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(String vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } - - public String getVnfdId() { - return vnfdId; - } - - public void setVnfdId(String vnfdId) { - this.vnfdId = vnfdId; - } - - public String getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - public String getVnfName() { - return vnfName; - } - - public void setVnfName(String vnfName) { - this.vnfName = vnfName; - } - - public ChangedInfo getChangedInfo() { - return changedInfo; - } - - public void setChangedInfo(ChangedInfo changedInfo) { - this.changedInfo = changedInfo; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java deleted file mode 100644 index 04e9481190..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffectedVnffg.java +++ /dev/null @@ -1,40 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class AffectedVnffg { - private String vnffgInstanceId; - private String vnffgdId; - - private enum changeType { - ADD, REMOVE, MODIFY - } - private enum changeResult { - COMPLETED, ROLLED_BACK, FAILED - } - - public String getVnffgInstanceId() { - return vnffgInstanceId; - } - - public void setVnffgInstanceId(String vnffgInstanceId) { - this.vnffgInstanceId = vnffgInstanceId; - } - - public String getVnffgdId() { - return vnffgdId; - } - - public void setVnffgdId(String vnffgdId) { - this.vnffgdId = vnffgdId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java deleted file mode 100644 index 7f019bcf40..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/AffinityOrAntiAffinityRule.java +++ /dev/null @@ -1,51 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class AffinityOrAntiAffinityRule { - private String vnfdId; - private List<String> vnfProfileId; - private List<String> vnfInstanceId; - - private enum affinityOrAntiAffiinty { - AFFINITY, ANTI_AFFIINTY - }; - private enum scope { - NFVI_POP, ZONE, ZONE_GROUP, NFVI_NODE - }; - - public String getVnfdId() { - return vnfdId; - } - - public void setVnfdId(String vnfdId) { - this.vnfdId = vnfdId; - } - - public List<String> getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(List<String> vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - public List<String> getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(List<String> vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java deleted file mode 100644 index 5de6cbf139..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ChangedInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class ChangedInfo { - private ModifyVnfInfoData changedVnfInfo; - private ExtVirtualLinkInfo changedExtConnectivity; - - public ModifyVnfInfoData getChangedVnfInfo() { - return changedVnfInfo; - } - - public void setChangedVnfInfo(ModifyVnfInfoData changedVnfInfo) { - this.changedVnfInfo = changedVnfInfo; - } - - public ExtVirtualLinkInfo getChangedExtConnectivity() { - return changedExtConnectivity; - } - - public void setChangedExtConnectivity(ExtVirtualLinkInfo changedExtConnectivity) { - this.changedExtConnectivity = changedExtConnectivity; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java deleted file mode 100644 index 2a63d39be0..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CivicAddressElement.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class CivicAddressElement { - private int caType; - private String caValue; - - public int getCaType() { - return caType; - } - - public void setCaType(int caType) { - this.caType = caType; - } - - public String getCaValue() { - return caValue; - } - - public void setCaValue(String caValue) { - this.caValue = caValue; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java deleted file mode 100644 index 27272ea22a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolData.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class CpProtocolData { - private String layerProtocol; - private IpOverEthernetAddressData ipOverEthernet; - - public String getLayerProtocol() { - return layerProtocol; - } - - public void setLayerProtocol(String layerProtocol) { - this.layerProtocol = layerProtocol; - } - - public IpOverEthernetAddressData getIpOverEthernet() { - return ipOverEthernet; - } - - public void setIpOverEthernet(IpOverEthernetAddressData ipOverEthernet) { - this.ipOverEthernet = ipOverEthernet; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java deleted file mode 100644 index 5f1191efe9..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CpProtocolInfo.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class CpProtocolInfo { - @NotNull - private enum layerProtocol { - IP_OVER_ETHERNET - }; - - private IpOverEthernetAddressData ipOverEthernet; - - public IpOverEthernetAddressData getIpOverEthernet() { - return ipOverEthernet; - } - - public void setIpOverEthernet(IpOverEthernetAddressData ipOverEthernet) { - this.ipOverEthernet = ipOverEthernet; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java deleted file mode 100644 index 878ce60ba1..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CreateNsRequest.java +++ /dev/null @@ -1,53 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class CreateNsRequest { - - String nsdId; - - String nsName; - - String nsDescription; - - - public String getNsdId() { - return nsdId; - } - - public void setNsdId(String nsdId) { - this.nsdId = nsdId; - } - - public String getNsDescription() { - return nsDescription; - } - - public void setNsDescription(String nsDescription) { - this.nsDescription = nsDescription; - } - - /** - * @return Returns the nsName. - */ - public String getNsName() { - return nsName; - } - - /** - * @param nsName The nsName to set. - */ - public void setNsName(String nsName) { - this.nsName = nsName; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java deleted file mode 100644 index e54f0dfb6d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/CustomerModel.java +++ /dev/null @@ -1,69 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * The Customer Model <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-10-12 - */ -public class CustomerModel { - - String globalCustomerId; - - String serviceType; - - - /** - * @return Returns the globalCustomerId. - */ - public String getGlobalCustomerId() { - return globalCustomerId; - } - - - /** - * @param globalCustomerId The globalCustomerId to set. - */ - public void setGlobalCustomerId(String globalCustomerId) { - this.globalCustomerId = globalCustomerId; - } - - - /** - * @return Returns the serviceType. - */ - public String getServiceType() { - return serviceType; - } - - - /** - * @param serviceType The serviceType to set. - */ - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java deleted file mode 100644 index 63ca66bd43..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtCpInfo.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class ExtCpInfo { - @NotNull - private String id; - @NotNull - private String cpdId; - private List<CpProtocolData> cpProtocolInfo; - private List<String> extLinkPortId; - - - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java deleted file mode 100644 index a1ab3fdb97..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtLinkPortInfo.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class ExtLinkPortInfo { - private String id; - private ResourceHandle resourceHandle; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public ResourceHandle getResourceHandle() { - return resourceHandle; - } - - public void setResourceHandle(ResourceHandle resourceHandle) { - this.resourceHandle = resourceHandle; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java deleted file mode 100644 index 3f643a8330..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtManagedVirtualLinkInfo.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class ExtManagedVirtualLinkInfo { - @NotNull - private String id; - @NotNull - private String vnfVirtualLinkDescId; - @NotNull - private ResourceHandle networkResource; - private List<VnfLinkPortInfo> vnfLinkPorts; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getVnfVirtualLinkDescId() { - return vnfVirtualLinkDescId; - } - - public void setVnfVirtualLinkDescId(String vnfVirtualLinkDescId) { - this.vnfVirtualLinkDescId = vnfVirtualLinkDescId; - } - - public ResourceHandle getNetworkResource() { - return networkResource; - } - - public void setNetworkResource(ResourceHandle networkResource) { - this.networkResource = networkResource; - } - - public List<VnfLinkPortInfo> getVnfLinkPorts() { - return vnfLinkPorts; - } - - public void setVnfLinkPorts(List<VnfLinkPortInfo> vnfLinkPorts) { - this.vnfLinkPorts = vnfLinkPorts; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java deleted file mode 100644 index ce7d1cfe6d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ExtVirtualLinkInfo.java +++ /dev/null @@ -1,42 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class ExtVirtualLinkInfo { - private String id; - private ResourceHandle resourceHandle; - private ExtLinkPortInfo extLinkPorts; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public ResourceHandle getResourceHandle() { - return resourceHandle; - } - - public void setResourceHandle(ResourceHandle resourceHandle) { - this.resourceHandle = resourceHandle; - } - - public ExtLinkPortInfo getExtLinkPorts() { - return extLinkPorts; - } - - public void setExtLinkPorts(ExtLinkPortInfo extLinkPorts) { - this.extLinkPorts = extLinkPorts; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java deleted file mode 100644 index ff0730a527..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiateNsRequest.java +++ /dev/null @@ -1,207 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; -import java.util.Map; - -public class InstantiateNsRequest { - - private String nsFlavourId; - private List<SapData> sapData; - private List<AddPnfData> addpnfData; - private List<VnfInstanceData> vnfInstanceData; - private List<String> nestedNsInstanceId; - private List<VnfLocationConstraint> localizationLanguage; - private Map<String, Object> aditionalParamsForNs; - private List<ParamsForVnf> additionalParamsForVnf; - private String startTime; - private String nsInstantiationLevelId; - private List<AffinityOrAntiAffinityRule> additionalAffinityOrAntiAffiniityRule; - - /*** - * - * @return nsFlavourId - */ - public String getNsFlavourId() { - return nsFlavourId; - } - - /*** - * - * @param nsFlavourId - */ - public void setNsFlavourId(String nsFlavourId) { - this.nsFlavourId = nsFlavourId; - } - - /*** - * - * @return - */ - public List<SapData> getSapData() { - return sapData; - } - - /*** - * - * @param sapData - */ - public void setSapData(List<SapData> sapData) { - this.sapData = sapData; - } - - /*** - * - * @return - */ - public List<AddPnfData> getAddpnfData() { - return addpnfData; - } - - /*** - * - * @param addpnfData - */ - public void setAddpnfData(List<AddPnfData> addpnfData) { - this.addpnfData = addpnfData; - } - - /*** - * - * @return - */ - public List<VnfInstanceData> getVnfInstanceData() { - return vnfInstanceData; - } - - /*** - * - * @param vnfInstanceData - */ - public void setVnfInstanceData(List<VnfInstanceData> vnfInstanceData) { - this.vnfInstanceData = vnfInstanceData; - } - - /*** - * - * @return - */ - public List<String> getNestedNsInstanceId() { - return nestedNsInstanceId; - } - - /*** - * - * @param nestedNsInstanceId - */ - public void setNestedNsInstanceId(List<String> nestedNsInstanceId) { - this.nestedNsInstanceId = nestedNsInstanceId; - } - - /*** - * - * @return - */ - public List<VnfLocationConstraint> getLocalizationLanguage() { - return localizationLanguage; - } - - /*** - * - * @param localizationLanguage - */ - public void setLocalizationLanguage(List<VnfLocationConstraint> localizationLanguage) { - this.localizationLanguage = localizationLanguage; - } - - /*** - * - * @return - */ - public Map<String, Object> getAditionalParamsForNs() { - return aditionalParamsForNs; - } - - /*** - * - * @param aditionalParamsForNs - */ - public void setAditionalParamsForNs(Map<String, Object> aditionalParamsForNs) { - this.aditionalParamsForNs = aditionalParamsForNs; - } - - /*** - * - * @return - */ - public List<ParamsForVnf> getAdditionalParamsForVnf() { - return additionalParamsForVnf; - } - - /*** - * - * @param additionalParamsForVnf - */ - public void setAdditionalParamsForVnf(List<ParamsForVnf> additionalParamsForVnf) { - this.additionalParamsForVnf = additionalParamsForVnf; - } - - /*** - * - * @return - */ - public String getStartTime() { - return startTime; - } - - /*** - * - * @param startTime - */ - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - /*** - * - * @return - */ - public String getNsInstantiationLevelId() { - return nsInstantiationLevelId; - } - - /*** - * - * @param nsInstantiationLevelId - */ - public void setNsInstantiationLevelId(String nsInstantiationLevelId) { - this.nsInstantiationLevelId = nsInstantiationLevelId; - } - - /*** - * - * @return - */ - public List<AffinityOrAntiAffinityRule> getAdditionalAffinityOrAntiAffiniityRule() { - return additionalAffinityOrAntiAffiniityRule; - } - - /*** - * - * @param additionalAffinityOrAntiAffiniityRule - */ - public void setAdditionalAffinityOrAntiAffiniityRule( - List<AffinityOrAntiAffinityRule> additionalAffinityOrAntiAffiniityRule) { - this.additionalAffinityOrAntiAffiniityRule = additionalAffinityOrAntiAffiniityRule; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java deleted file mode 100644 index e66bb90bbd..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/InstantiatedVnfInfo.java +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class InstantiatedVnfInfo { - @NotNull - private String flavourId; - @NotNull - private String vnfState; - private List<VnfScaleInfo> vnfScaleInfos; - @NotNull - private List<ExtCpInfo> extCpInfo; - private List<ExtVirtualLinkInfo> extVirtualLinkInfo; - private List<ExtManagedVirtualLinkInfo> extManagedVirtualLinkInfo; - // Defination of MonitoringParameter is not there in ETSI document - // considering as String - private List<String> monitoringParameters; - private String localizationLanguage; - - private List<VnfcResourceInfo> vnfcResourceInfo; - // Defination of VirtualStorageResourceInfo is not there in ETSI document - // considering as String - private List<String> virtualStorageResourceInfo; - - public String getFlavourId() { - return flavourId; - } - - public void setFlavourId(String flavourId) { - this.flavourId = flavourId; - } - - public String getVnfState() { - return vnfState; - } - - public void setVnfState(String vnfState) { - this.vnfState = vnfState; - } - - public List<VnfScaleInfo> getVnfScaleInfos() { - return vnfScaleInfos; - } - - public void setVnfScaleInfos(List<VnfScaleInfo> vnfScaleInfos) { - this.vnfScaleInfos = vnfScaleInfos; - } - - public List<ExtCpInfo> getExtCpInfo() { - return extCpInfo; - } - - public void setExtCpInfo(List<ExtCpInfo> extCpInfo) { - this.extCpInfo = extCpInfo; - } - - public List<ExtVirtualLinkInfo> getExtVirtualLinkInfo() { - return extVirtualLinkInfo; - } - - public void setExtVirtualLinkInfo(List<ExtVirtualLinkInfo> extVirtualLinkInfo) { - this.extVirtualLinkInfo = extVirtualLinkInfo; - } - - public List<ExtManagedVirtualLinkInfo> getExtManagedVirtualLinkInfo() { - return extManagedVirtualLinkInfo; - } - - public void setExtManagedVirtualLinkInfo(List<ExtManagedVirtualLinkInfo> extManagedVirtualLinkInfo) { - this.extManagedVirtualLinkInfo = extManagedVirtualLinkInfo; - } - - public List<String> getMonitoringParameters() { - return monitoringParameters; - } - - public void setMonitoringParameters(List<String> monitoringParameters) { - this.monitoringParameters = monitoringParameters; - } - - public String getLocalizationLanguage() { - return localizationLanguage; - } - - public void setLocalizationLanguage(String localizationLanguage) { - this.localizationLanguage = localizationLanguage; - } - - public List<VnfcResourceInfo> getVnfcResourceInfo() { - return vnfcResourceInfo; - } - - public void setVnfcResourceInfo(List<VnfcResourceInfo> vnfcResourceInfo) { - this.vnfcResourceInfo = vnfcResourceInfo; - } - - public List<String> getVirtualStorageResourceInfo() { - return virtualStorageResourceInfo; - } - - public void setVirtualStorageResourceInfo(List<String> virtualStorageResourceInfo) { - this.virtualStorageResourceInfo = virtualStorageResourceInfo; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java deleted file mode 100644 index 32c5571d96..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpAddresses.java +++ /dev/null @@ -1,63 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class IpAddresses { - private String type; - private List<String> fixedAddresses; - private int numDynamicAddresses; - private AddressRange addressRange; - private String subnetId; - - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public List<String> getFixedAddresses() { - return fixedAddresses; - } - - public void setFixedAddresses(List<String> fixedAddresses) { - this.fixedAddresses = fixedAddresses; - } - - public int getNumDynamicAddresses() { - return numDynamicAddresses; - } - - public void setNumDynamicAddresses(int numDynamicAddresses) { - this.numDynamicAddresses = numDynamicAddresses; - } - - public AddressRange getAddressRange() { - return addressRange; - } - - public void setAddressRange(AddressRange addressRange) { - this.addressRange = addressRange; - } - - public String getSubnetId() { - return subnetId; - } - - public void setSubnetId(String subnetId) { - this.subnetId = subnetId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java deleted file mode 100644 index 48529e5f76..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/IpOverEthernetAddressData.java +++ /dev/null @@ -1,35 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class IpOverEthernetAddressData { - private String macAddress; - private List<IpAddresses> ipAddresses; - - public String getMacAddress() { - return macAddress; - } - - public void setMacAddress(String macAddress) { - this.macAddress = macAddress; - } - - public List<IpAddresses> getIpAddresses() { - return ipAddresses; - } - - public void setIpAddresses(List<IpAddresses> ipAddresses) { - this.ipAddresses = ipAddresses; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Link.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Link.java deleted file mode 100644 index 2459346826..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Link.java +++ /dev/null @@ -1,24 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class Link { - private String href; - - public String getHref() { - return href; - } - - public void setHref(String href) { - this.href = href; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Links.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Links.java deleted file mode 100644 index 8ad8f000c1..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Links.java +++ /dev/null @@ -1,78 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class Links { - private Link self; - private Link nsInstance; - private Link cancel; - private Link retry; - private Link rollback; - private Link continues; - private Link fail; - - public Link getSelf() { - return self; - } - - public void setSelf(Link self) { - this.self = self; - } - - public Link getNsInstance() { - return nsInstance; - } - - public void setNsInstance(Link nsInstance) { - this.nsInstance = nsInstance; - } - - public Link getCancel() { - return cancel; - } - - public void setCancel(Link cancel) { - this.cancel = cancel; - } - - public Link getRetry() { - return retry; - } - - public void setRetry(Link retry) { - this.retry = retry; - } - - public Link getRollback() { - return rollback; - } - - public void setRollback(Link rollback) { - this.rollback = rollback; - } - - public Link getContinues() { - return continues; - } - - public void setContinues(Link continues) { - this.continues = continues; - } - - public Link getFail() { - return fail; - } - - public void setFail(Link fail) { - this.fail = fail; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java deleted file mode 100644 index b79565d7a9..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraint.java +++ /dev/null @@ -1,73 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class LocationConstraint { - - /** - * vnf profile id - */ - private String vnfProfileId; - - /** - * location constraints: vimId - */ - private VimLocation locationConstraints; - - /** - * @return Returns the vnfProfileId. - */ - public String getVnfProfileId() { - return vnfProfileId; - } - - /** - * @param vnfProfileId The vnfProfileId to set. - */ - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - - /** - * @return Returns the locationConstraints. - */ - public VimLocation getLocationConstraints() { - return locationConstraints; - } - - - /** - * @param locationConstraints The locationConstraints to set. - */ - public void setLocationConstraints(VimLocation locationConstraints) { - this.locationConstraints = locationConstraints; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java deleted file mode 100644 index b636d49edf..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/LocationConstraints.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class LocationConstraints { - private String countryCode; - private CivicAddressElement civicAddressElement; - - public String getCountryCode() { - return countryCode; - } - - public void setCountryCode(String countryCode) { - this.countryCode = countryCode; - } - - public CivicAddressElement getCivicAddressElement() { - return civicAddressElement; - } - - public void setCivicAddressElement(CivicAddressElement civicAddressElement) { - this.civicAddressElement = civicAddressElement; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Mask.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Mask.java deleted file mode 100644 index 352f47e19f..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/Mask.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class Mask { - @NotNull - private int startingPoint; - @NotNull - private int length; - @NotNull - private String value; - - public int getStartingPoint() { - return startingPoint; - } - - public void setStartingPoint(int startingPoint) { - this.startingPoint = startingPoint; - } - - public int getLength() { - return length; - } - - public void setLength(int length) { - this.length = length; - } - - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java deleted file mode 100644 index 55ab21e8e2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ModifyVnfInfoData.java +++ /dev/null @@ -1,80 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.Map; - -public class ModifyVnfInfoData { - private String vnfInstanceId; - private String vnfInstanceName; - private String vnfInstanceDescription; - private String vnfPkgId; - private Map<String, Object> vnfConfigurableProperties; - private Map<String, Object> Metadata; - private Map<String, Object> Extensions; - - public String getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(String vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } - - public String getVnfInstanceName() { - return vnfInstanceName; - } - - public void setVnfInstanceName(String vnfInstanceName) { - this.vnfInstanceName = vnfInstanceName; - } - - public String getVnfInstanceDescription() { - return vnfInstanceDescription; - } - - public void setVnfInstanceDescription(String vnfInstanceDescription) { - this.vnfInstanceDescription = vnfInstanceDescription; - } - - public String getVnfPkgId() { - return vnfPkgId; - } - - public void setVnfPkgId(String vnfPkgId) { - this.vnfPkgId = vnfPkgId; - } - - public Map<String, Object> getVnfConfigurableProperties() { - return vnfConfigurableProperties; - } - - public void setVnfConfigurableProperties(Map<String, Object> vnfConfigurableProperties) { - this.vnfConfigurableProperties = vnfConfigurableProperties; - } - - public Map<String, Object> getMetadata() { - return Metadata; - } - - public void setMetadata(Map<String, Object> metadata) { - Metadata = metadata; - } - - public Map<String, Object> getExtensions() { - return Extensions; - } - - public void setExtensions(Map<String, Object> extensions) { - Extensions = extensions; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java deleted file mode 100644 index 266e5ee5d8..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NSResourceInputParameter.java +++ /dev/null @@ -1,154 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (C) 2018 CMCC All rights reserved. - * Modifications Copyright (c) 2019 Samsung - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.io.ByteArrayOutputStream; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * NS Create Input Parameter For VFC Adapter<br> - * <p> - * </p> - * - * @version ONAP Amsterdam Release 2017/1/7 - */ -public class NSResourceInputParameter { - - private static final Logger logger = LoggerFactory.getLogger(NSResourceInputParameter.class); - - private NsOperationKey nsOperationKey; - - private String nsServiceName; - - private String nsServiceDescription; - - private String nsServiceModelUUID; - - private NsParameters nsParameters; - - private NsScaleParameters nsScaleParameters; - - - /** - * @return Returns the nsServiceName. - */ - public String getNsServiceName() { - return nsServiceName; - } - - - /** - * @param nsServiceName The nsServiceName to set. - */ - public void setNsServiceName(String nsServiceName) { - this.nsServiceName = nsServiceName; - } - - - /** - * @return Returns the nsServiceDescription. - */ - public String getNsServiceDescription() { - return nsServiceDescription; - } - - - /** - * @param nsServiceDescription The nsServiceDescription to set. - */ - public void setNsServiceDescription(String nsServiceDescription) { - this.nsServiceDescription = nsServiceDescription; - } - - /** - * @return Returns the nsParameters. - */ - public NsParameters getNsParameters() { - return nsParameters; - } - - /** - * @param nsParameters The nsParameters to set. - */ - public void setNsParameters(NsParameters nsParameters) { - this.nsParameters = nsParameters; - } - - public NsOperationKey getNsOperationKey() { - return nsOperationKey; - } - - public void setNsOperationKey(NsOperationKey nsOperationKey) { - this.nsOperationKey = nsOperationKey; - } - - public String toJsonString() { - String jsonString = null; - try { - ObjectMapper mapper = new ObjectMapper(); - mapper.enable(SerializationFeature.WRAP_ROOT_VALUE); - jsonString = mapper.writeValueAsString(this); - } catch (Exception e) { - logger.debug("Exception:", e); - } - return jsonString; - } - - public String toXmlString() { - try { - ByteArrayOutputStream bs = new ByteArrayOutputStream(); - JAXBContext context = JAXBContext.newInstance(this.getClass()); - Marshaller marshaller = context.createMarshaller(); - marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true); // pretty print XML - marshaller.marshal(this, bs); - return bs.toString(); - } catch (Exception e) { - logger.debug("Exception:", e); - return ""; - } - } - - public NsScaleParameters getNsScaleParameters() { - return nsScaleParameters; - } - - public void setNsScaleParameters(NsScaleParameters nsScaleParameters) { - this.nsScaleParameters = nsScaleParameters; - } - - - public String getNsServiceModelUUID() { - return nsServiceModelUUID; - } - - - public void setNsServiceModelUUID(String nsServiceModelUUID) { - this.nsServiceModelUUID = nsServiceModelUUID; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java deleted file mode 100644 index a6e3963725..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpInfo.java +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class NfpInfo { - @NotNull - private String id; - private String nfpdId; - private String nfpName; - private String description; - @NotNull - private List<NsCpHandle> nscpHandle; - private int totalCp; - @NotNull - private NfpRule nfpRule; - - @NotNull - private enum nfpState { - ENABLED, DISABLED - }; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getNfpdId() { - return nfpdId; - } - - public void setNfpdId(String nfpdId) { - this.nfpdId = nfpdId; - } - - public String getNfpName() { - return nfpName; - } - - public void setNfpName(String nfpName) { - this.nfpName = nfpName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public List<NsCpHandle> getNscpHandle() { - return nscpHandle; - } - - public void setNscpHandle(List<NsCpHandle> nscpHandle) { - this.nscpHandle = nscpHandle; - } - - public int getTotalCp() { - return totalCp; - } - - public void setTotalCp(int totalCp) { - this.totalCp = totalCp; - } - - public NfpRule getNfpRule() { - return nfpRule; - } - - public void setNfpRule(NfpRule nfpRule) { - this.nfpRule = nfpRule; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java deleted file mode 100644 index b4f684a3e2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NfpRule.java +++ /dev/null @@ -1,108 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class NfpRule { - private String etherDestinationAddress; - private String etherSourceAddress; - - private enum etherType { - IPV4, IPV6 - }; - - private List<String> vlanTag; - - private enum protocol { - TCP, UDP, ICMP - } - - private String dscp; - private PortRange sourcePortRange; - private PortRange destinationPortRange; - private String sourceIpAddressPrefix; - private String destinationIpAddressPrefix; - private List<Mask> extendedCriteria; - - public String getEtherDestinationAddress() { - return etherDestinationAddress; - } - - public void setEtherDestinationAddress(String etherDestinationAddress) { - this.etherDestinationAddress = etherDestinationAddress; - } - - public String getEtherSourceAddress() { - return etherSourceAddress; - } - - public void setEtherSourceAddress(String etherSourceAddress) { - this.etherSourceAddress = etherSourceAddress; - } - - public List<String> getVlanTag() { - return vlanTag; - } - - public void setVlanTag(List<String> vlanTag) { - this.vlanTag = vlanTag; - } - - public String getDscp() { - return dscp; - } - - public void setDscp(String dscp) { - this.dscp = dscp; - } - - public PortRange getSourcePortRange() { - return sourcePortRange; - } - - public void setSourcePortRange(PortRange sourcePortRange) { - this.sourcePortRange = sourcePortRange; - } - - public PortRange getDestinationPortRange() { - return destinationPortRange; - } - - public void setDestinationPortRange(PortRange destinationPortRange) { - this.destinationPortRange = destinationPortRange; - } - - public String getSourceIpAddressPrefix() { - return sourceIpAddressPrefix; - } - - public void setSourceIpAddressPrefix(String sourceIpAddressPrefix) { - this.sourceIpAddressPrefix = sourceIpAddressPrefix; - } - - public String getDestinationIpAddressPrefix() { - return destinationIpAddressPrefix; - } - - public void setDestinationIpAddressPrefix(String destinationIpAddressPrefix) { - this.destinationIpAddressPrefix = destinationIpAddressPrefix; - } - - public List<Mask> getExtendedCriteria() { - return extendedCriteria; - } - - public void setExtendedCriteria(List<Mask> extendedCriteria) { - this.extendedCriteria = extendedCriteria; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java deleted file mode 100644 index 326488fb76..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCpHandle.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class NsCpHandle { - private String vnfInstanceId; - private String vnfExtCpInstanceId; - private String pnfInfoId; - private String pnfExtCpInstanceId; - private String nsInstanceId; - private String nsSapInstanceId; - - public String getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(String vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } - - public String getVnfExtCpInstanceId() { - return vnfExtCpInstanceId; - } - - public void setVnfExtCpInstanceId(String vnfExtCpInstanceId) { - this.vnfExtCpInstanceId = vnfExtCpInstanceId; - } - - public String getPnfInfoId() { - return pnfInfoId; - } - - public void setPnfInfoId(String pnfInfoId) { - this.pnfInfoId = pnfInfoId; - } - - public String getPnfExtCpInstanceId() { - return pnfExtCpInstanceId; - } - - public void setPnfExtCpInstanceId(String pnfExtCpInstanceId) { - this.pnfExtCpInstanceId = pnfExtCpInstanceId; - } - - public String getNsInstanceId() { - return nsInstanceId; - } - - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - - public String getNsSapInstanceId() { - return nsSapInstanceId; - } - - public void setNsSapInstanceId(String nsSapInstanceId) { - this.nsSapInstanceId = nsSapInstanceId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java deleted file mode 100644 index 63358cb384..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsCreateReq.java +++ /dev/null @@ -1,102 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * Network Service Request<br/> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Sep 2, 2016 - */ -public class NsCreateReq { - - CustomerModel context; - - String csarId; - - String nsName; - - String description; - - - /** - * @return Returns the context. - */ - public CustomerModel getContext() { - return context; - } - - - - /** - * @param context The context to set. - */ - public void setContext(CustomerModel context) { - this.context = context; - } - - - /** - * @return Returns the csarId. - */ - public String getCsarId() { - return csarId; - } - - - /** - * @param csarId The csarId to set. - */ - public void setCsarId(String csarId) { - this.csarId = csarId; - } - - /** - * @return Returns the nsName. - */ - public String getNsName() { - return nsName; - } - - /** - * @param nsName The nsName to set. - */ - public void setNsName(String nsName) { - this.nsName = nsName; - } - - /** - * @return Returns the description. - */ - public String getDescription() { - return description; - } - - /** - * @param description The description to set. - */ - public void setDescription(String description) { - this.description = description; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java deleted file mode 100644 index d2d4b4e772..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstance.java +++ /dev/null @@ -1,166 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class NsInstance { - @NotNull - private String id; - @NotNull - private String nsInstanceName; - @NotNull - private String nsInstanceDescription; - @NotNull - private String nsdId; - @NotNull - private String nsdInfoId; - private String flavourId; - private List<VnfInstance> vnfInstance; - private List<PnfInfo> pnfInfo; - private List<NsVirtualLinkInfo> virtualLinkInfo; - private List<VnffgInfo> vnffgInfo; - private List<SapInfo> sapInfo; - private List<String> nestedNsInstanceId; - - @NotNull - private enum nsState { - NOT_INSTANTIATED, INSTANTIATED - }; - - private List<NsScaleInfo> nsScaleStatus; - private List<AffinityOrAntiAffinityRule> additionalAffinityOrAntiAffinityRule; - @NotNull - private NsInstanceLinks _links; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getNsInstanceName() { - return nsInstanceName; - } - - public void setNsInstanceName(String nsInstanceName) { - this.nsInstanceName = nsInstanceName; - } - - public String getNsInstanceDescription() { - return nsInstanceDescription; - } - - public void setNsInstanceDescription(String nsInstanceDescription) { - this.nsInstanceDescription = nsInstanceDescription; - } - - public String getNsdId() { - return nsdId; - } - - public void setNsdId(String nsdId) { - this.nsdId = nsdId; - } - - public String getNsdInfoId() { - return nsdInfoId; - } - - public void setNsdInfoId(String nsdInfoId) { - this.nsdInfoId = nsdInfoId; - } - - public String getFlavourId() { - return flavourId; - } - - public void setFlavourId(String flavourId) { - this.flavourId = flavourId; - } - - public List<VnfInstance> getVnfInstance() { - return vnfInstance; - } - - public void setVnfInstance(List<VnfInstance> vnfInstance) { - this.vnfInstance = vnfInstance; - } - - public List<PnfInfo> getPnfInfo() { - return pnfInfo; - } - - public void setPnfInfo(List<PnfInfo> pnfInfo) { - this.pnfInfo = pnfInfo; - } - - public List<NsVirtualLinkInfo> getVirtualLinkInfo() { - return virtualLinkInfo; - } - - public void setVirtualLinkInfo(List<NsVirtualLinkInfo> virtualLinkInfo) { - this.virtualLinkInfo = virtualLinkInfo; - } - - public List<VnffgInfo> getVnffgInfo() { - return vnffgInfo; - } - - public void setVnffgInfo(List<VnffgInfo> vnffgInfo) { - this.vnffgInfo = vnffgInfo; - } - - public List<SapInfo> getSapInfo() { - return sapInfo; - } - - public void setSapInfo(List<SapInfo> sapInfo) { - this.sapInfo = sapInfo; - } - - public List<String> getNestedNsInstanceId() { - return nestedNsInstanceId; - } - - public void setNestedNsInstanceId(List<String> nestedNsInstanceId) { - this.nestedNsInstanceId = nestedNsInstanceId; - } - - public List<NsScaleInfo> getNsScaleStatus() { - return nsScaleStatus; - } - - public void setNsScaleStatus(List<NsScaleInfo> nsScaleStatus) { - this.nsScaleStatus = nsScaleStatus; - } - - public List<AffinityOrAntiAffinityRule> getAdditionalAffinityOrAntiAffinityRule() { - return additionalAffinityOrAntiAffinityRule; - } - - public void setAdditionalAffinityOrAntiAffinityRule( - List<AffinityOrAntiAffinityRule> additionalAffinityOrAntiAffinityRule) { - this.additionalAffinityOrAntiAffinityRule = additionalAffinityOrAntiAffinityRule; - } - - public NsInstanceLinks get_links() { - return _links; - } - - public void set_links(NsInstanceLinks _links) { - this._links = _links; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java deleted file mode 100644 index 08b3c63c08..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstanceLinks.java +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class NsInstanceLinks { - @NotNull - private Link self; - private List<Link> nestedNsInstances; - private Link instantiate; - private Link terminate; - private Link update; - private Link scale; - private Link heal; - - public Link getSelf() { - return self; - } - - public void setSelf(Link self) { - this.self = self; - } - - public List<Link> getNestedNsInstances() { - return nestedNsInstances; - } - - public void setNestedNsInstances(List<Link> nestedNsInstances) { - this.nestedNsInstances = nestedNsInstances; - } - - public Link getInstantiate() { - return instantiate; - } - - public void setInstantiate(Link instantiate) { - this.instantiate = instantiate; - } - - public Link getTerminate() { - return terminate; - } - - public void setTerminate(Link terminate) { - this.terminate = terminate; - } - - public Link getUpdate() { - return update; - } - - public void setUpdate(Link update) { - this.update = update; - } - - public Link getScale() { - return scale; - } - - public void setScale(Link scale) { - this.scale = scale; - } - - public Link getHeal() { - return heal; - } - - public void setHeal(Link heal) { - this.heal = heal; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java deleted file mode 100644 index 4281026021..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsInstantiateReq.java +++ /dev/null @@ -1,50 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * <br> - * <p> - * </p> - * request model for instatiate - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class NsInstantiateReq extends NsParameters { - - String nsInstanceId; - - /** - * @return Returns the nsInstanceId. - */ - public String getNsInstanceId() { - return nsInstanceId; - } - - /** - * @param nsInstanceId The nsInstanceId to set. - */ - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java deleted file mode 100644 index 559b1f7ba7..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLcmOpOcc.java +++ /dev/null @@ -1,125 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import org.onap.so.adapters.vfc.constant.CommonConstant; - -public class NsLcmOpOcc { - private String id; - private CommonConstant.operationState operationState; - private String statusEnteredTime; - private String nsInstanceId; - private CommonConstant.lcmOperationType lcmOperationType; - private String startTime; - private Boolean isAutomaticInvocation; - private String operationParams; - private Boolean isCancelPending; - private CommonConstant.cancelMode cancelMode; - private ProblemDetails error; - private Links links; - - public CommonConstant.lcmOperationType getLcmOperationType() { - return lcmOperationType; - } - - public void setLcmOperationType(CommonConstant.lcmOperationType lcmOperationType) { - this.lcmOperationType = lcmOperationType; - } - - public CommonConstant.cancelMode getCancelMode() { - return cancelMode; - } - - public void setCancelMode(CommonConstant.cancelMode cancelMode) { - this.cancelMode = cancelMode; - } - - public CommonConstant.operationState getOperationState() { - return operationState; - } - - public void setOperationState(CommonConstant.operationState operationState) { - this.operationState = operationState; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getStatusEnteredTime() { - return statusEnteredTime; - } - - public void setStatusEnteredTime(String statusEnteredTime) { - this.statusEnteredTime = statusEnteredTime; - } - - public String getNsInstanceId() { - return nsInstanceId; - } - - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - - public String getStartTime() { - return startTime; - } - - public void setStartTime(String startTime) { - this.startTime = startTime; - } - - public Boolean getAutomaticInvocation() { - return isAutomaticInvocation; - } - - public void setAutomaticInvocation(Boolean automaticInvocation) { - isAutomaticInvocation = automaticInvocation; - } - - public String getOperationParams() { - return operationParams; - } - - public void setOperationParams(String operationParams) { - this.operationParams = operationParams; - } - - public Boolean getCancelPending() { - return isCancelPending; - } - - public void setCancelPending(Boolean cancelPending) { - isCancelPending = cancelPending; - } - - public ProblemDetails getError() { - return error; - } - - public void setError(ProblemDetails error) { - this.error = error; - } - - public Links getLinks() { - return links; - } - - public void setLinks(Links links) { - this.links = links; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java deleted file mode 100644 index 2dff432c3b..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsLinkPortInfo.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class NsLinkPortInfo { - @NotNull - private String id; - @NotNull - private ResourceHandle resourceHandle; - private NsCpHandle nsCpHandle; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public ResourceHandle getResourceHandle() { - return resourceHandle; - } - - public void setResourceHandle(ResourceHandle resourceHandle) { - this.resourceHandle = resourceHandle; - } - - public NsCpHandle getNsCpHandle() { - return nsCpHandle; - } - - public void setNsCpHandle(NsCpHandle nsCpHandle) { - this.nsCpHandle = nsCpHandle; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java deleted file mode 100644 index 2088d68b56..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsOperationKey.java +++ /dev/null @@ -1,140 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * The operation key object for NS <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-09-15 - */ -public class NsOperationKey { - - /** - * The subscriber id - */ - private String globalSubscriberId; - - /** - * The serviceType - */ - private String serviceType; - - /** - * The service ID - */ - private String serviceId; - - /** - * The Operation ID - */ - private String operationId; - - /** - * the NS template uuid - */ - private String nodeTemplateUUID; - - /** - * @return Returns the globalSubscriberId. - */ - public String getGlobalSubscriberId() { - return globalSubscriberId; - } - - /** - * @param globalSubscriberId The globalSubscriberId to set. - */ - public void setGlobalSubscriberId(String globalSubscriberId) { - this.globalSubscriberId = globalSubscriberId; - } - - /** - * @return Returns the serviceType. - */ - public String getServiceType() { - return serviceType; - } - - /** - * @param serviceType The serviceType to set. - */ - public void setServiceType(String serviceType) { - this.serviceType = serviceType; - } - - /** - * <br> - * - * @return - * @since ONAP Amsterdam Release - */ - public String getServiceId() { - return serviceId; - } - - /** - * <br> - * - * @param serviceId - * @since ONAP Amsterdam Release - */ - public void setServiceId(String serviceId) { - this.serviceId = serviceId; - } - - /** - * <br> - * - * @return - * @since ONAP Amsterdam Release - */ - public String getOperationId() { - return operationId; - } - - /** - * <br> - * - * @param operationId - * @since ONAP Amsterdam Release - */ - public void setOperationId(String operationId) { - this.operationId = operationId; - } - - /** - * @return Returns the nodeTemplateUUID. - */ - public String getNodeTemplateUUID() { - return nodeTemplateUUID; - } - - /** - * @param nodeTemplateUUID The nodeTemplateUUID to set. - */ - public void setNodeTemplateUUID(String nodeTemplateUUID) { - this.nodeTemplateUUID = nodeTemplateUUID; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java deleted file mode 100644 index e82ee2a79a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsParameters.java +++ /dev/null @@ -1,70 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class NsParameters { - - private List<LocationConstraint> locationConstraints; - - private Map<String, Object> additionalParamForNs = new HashMap<>(); - - /** - * @return Returns the locationConstraints. - */ - public List<LocationConstraint> getLocationConstraints() { - return locationConstraints; - } - - /** - * @param locationConstraints The locationConstraints to set. - */ - public void setLocationConstraints(List<LocationConstraint> locationConstraints) { - this.locationConstraints = locationConstraints; - } - - - /** - * @return Returns the additionalParamForNs. - */ - public Map<String, Object> getAdditionalParamForNs() { - return additionalParamForNs; - } - - - /** - * @param additionalParamForNs The additionalParamForNs to set. - */ - public void setAdditionalParamForNs(Map<String, Object> additionalParamForNs) { - this.additionalParamForNs = additionalParamForNs; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java deleted file mode 100644 index a7e72efb62..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsProgressStatus.java +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -/** - * <br> - * <p> - * </p> - * response model of query operation status - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class NsProgressStatus { - - String jobId; - - ResponseDescriptor responseDescriptor; - - List<ResponseDescriptor> responseHistoryList; - - /** - * @return Returns the jobId. - */ - public String getJobId() { - return jobId; - } - - /** - * @param jobId The jobId to set. - */ - public void setJobId(String jobId) { - this.jobId = jobId; - } - - /** - * @return Returns the responseDescriptor. - */ - public ResponseDescriptor getResponseDescriptor() { - return responseDescriptor; - } - - /** - * @param responseDescriptor The responseDescriptor to set. - */ - public void setResponseDescriptor(ResponseDescriptor responseDescriptor) { - this.responseDescriptor = responseDescriptor; - } - - /** - * @return Returns the responseHistoryList. - */ - public List<ResponseDescriptor> getResponseHistoryList() { - return responseHistoryList; - } - - /** - * @param responseHistoryList The responseHistoryList to set. - */ - public void setResponseHistoryList(List<ResponseDescriptor> responseHistoryList) { - this.responseHistoryList = responseHistoryList; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java deleted file mode 100644 index 59acf564c2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleInfo.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class NsScaleInfo { - @NotNull - private String nsScalingAspectId; - @NotNull - private String nsScaleLevelId; - - public String getNsScalingAspectId() { - return nsScalingAspectId; - } - - public void setNsScalingAspectId(String nsScalingAspectId) { - this.nsScalingAspectId = nsScalingAspectId; - } - - public String getNsScaleLevelId() { - return nsScaleLevelId; - } - - public void setNsScaleLevelId(String nsScaleLevelId) { - this.nsScaleLevelId = nsScaleLevelId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java deleted file mode 100644 index 6d089c0479..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleParameters.java +++ /dev/null @@ -1,66 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 CMCC Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -/** - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-9-26 - */ -public class NsScaleParameters { - - private List<ScaleNsByStepsData> scaleNsByStepsData; - - private String scaleType; - - /** - * @return Returns the scaleNsByStepsData. - */ - public List<ScaleNsByStepsData> getScaleNsByStepsData() { - return scaleNsByStepsData; - } - - /** - * @param scaleNsByStepsData The scaleNsByStepsData to set. - */ - public void setScaleNsByStepsData(List<ScaleNsByStepsData> scaleNsByStepsData) { - this.scaleNsByStepsData = scaleNsByStepsData; - } - - /** - * @return Returns the scale Type. - */ - public String getScaleType() { - return scaleType; - } - - /** - * @param scaleType The scaleType to set. - */ - public void setScaleType(String scaleType) { - this.scaleType = scaleType; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java deleted file mode 100644 index 79ed02c69f..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsScaleReq.java +++ /dev/null @@ -1,49 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 CMCC Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.so.adapters.vfc.model; - -/** - * <br> - * <p> - * </p> - * request model for scale - * - * @author - * @version ONAP Amsterdam Release 2017-9-26 - */ -public class NsScaleReq extends NsScaleParameters { - - String nsInstanceId; - - /** - * @return Returns the nsInstanceId. - */ - public String getNsInstanceId() { - return nsInstanceId; - } - - /** - * @param nsInstanceId The nsInstanceId to set. - */ - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java deleted file mode 100644 index ed2debd2e6..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/NsVirtualLinkInfo.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class NsVirtualLinkInfo { - @NotNull - private String id; - @NotNull - private String nsVirtualLinkDescId; - @NotNull - private List<ResourceHandle> resourceHandle; - private List<NsLinkPortInfo> linkPort; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getNsVirtualLinkDescId() { - return nsVirtualLinkDescId; - } - - public void setNsVirtualLinkDescId(String nsVirtualLinkDescId) { - this.nsVirtualLinkDescId = nsVirtualLinkDescId; - } - - public List<ResourceHandle> getResourceHandle() { - return resourceHandle; - } - - public void setResourceHandle(List<ResourceHandle> resourceHandle) { - this.resourceHandle = resourceHandle; - } - - public List<NsLinkPortInfo> getLinkPort() { - return linkPort; - } - - public void setLinkPort(List<NsLinkPortInfo> linkPort) { - this.linkPort = linkPort; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java deleted file mode 100644 index b7324e50fe..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ParamsForVnf.java +++ /dev/null @@ -1,35 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.Map; - -public class ParamsForVnf { - private String vnfProfileId; - private Map<String, Object> additionalParams; - - public String getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - public Map<String, Object> getAdditionalParams() { - return additionalParams; - } - - public void setAdditionalParams(Map<String, Object> additionalParams) { - this.additionalParams = additionalParams; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java deleted file mode 100644 index d5d091fcb1..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpData.java +++ /dev/null @@ -1,44 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class PnfExtCpData { - private String cpInstanceI16; - private String cpdId; - private List<CpProtocolData> cpProtocolData; - - public String getCpInstanceI16() { - return cpInstanceI16; - } - - public void setCpInstanceI16(String cpInstanceI16) { - this.cpInstanceI16 = cpInstanceI16; - } - - public String getCpdId() { - return cpdId; - } - - public void setCpdId(String cpdId) { - this.cpdId = cpdId; - } - - public List<CpProtocolData> getCpProtocolData() { - return cpProtocolData; - } - - public void setCpProtocolData(List<CpProtocolData> cpProtocolData) { - this.cpProtocolData = cpProtocolData; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java deleted file mode 100644 index 402cb83147..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfExtCpInfo.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class PnfExtCpInfo { - @NotNull - private String cpInstanceId; - @NotNull - private String cpdId; - @NotNull - private List<CpProtocolData> cpProtocolData; - - public String getCpInstanceI16() { - return cpInstanceId; - } - - public void setCpInstanceI16(String cpInstanceI16) { - this.cpInstanceId = cpInstanceI16; - } - - public String getCpdId() { - return cpdId; - } - - public void setCpdId(String cpdId) { - this.cpdId = cpdId; - } - - public List<CpProtocolData> getCpProtocolData() { - return cpProtocolData; - } - - public void setCpProtocolData(List<CpProtocolData> cpProtocolData) { - this.cpProtocolData = cpProtocolData; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java deleted file mode 100644 index a1cc11bd0c..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PnfInfo.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class PnfInfo { - - @NotNull - private String pnfId; - @NotNull - private String pnfName; - @NotNull - private String pnfdId; - @NotNull - private String pnfdInfoId; - @NotNull - private String pnfProfileId; - private List<PnfExtCpData> cpData; - - /*** - * - * @return id of pnf - */ - public String getPnfId() { - return pnfId; - } - - public void setPnfId(String pnfId) { - this.pnfId = pnfId; - } - - public String getPnfName() { - return pnfName; - } - - public void setPnfName(String pnfName) { - this.pnfName = pnfName; - } - - public String getPnfdId() { - return pnfdId; - } - - public void setPnfdId(String pnfdId) { - this.pnfdId = pnfdId; - } - - public String getPnfProfileId() { - return pnfProfileId; - } - - public void setPnfProfileId(String pnfProfileId) { - this.pnfProfileId = pnfProfileId; - } - - public List<PnfExtCpData> getCpData() { - return cpData; - } - - public void setCpData(List<PnfExtCpData> cpData) { - this.cpData = cpData; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java deleted file mode 100644 index 8318a8ccff..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/PortRange.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class PortRange { - @NotNull - private int lowerPort; - @NotNull - private int upperPort; - - public int getLowerPort() { - return lowerPort; - } - - public void setLowerPort(int lowerPort) { - this.lowerPort = lowerPort; - } - - public int getUpperPort() { - return upperPort; - } - - public void setUpperPort(int upperPort) { - this.upperPort = upperPort; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java deleted file mode 100644 index efaa5de7a8..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ProblemDetails.java +++ /dev/null @@ -1,62 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class ProblemDetails { - private String type; - private String title; - private int status; - private String detail; - private String instance; - - public String getType() { - return type; - } - - public void setType(String type) { - this.type = type; - } - - public String getTitle() { - return title; - } - - public void setTitle(String title) { - this.title = title; - } - - public int getStatus() { - return status; - } - - public void setStatus(int status) { - this.status = status; - } - - public String getDetail() { - return detail; - } - - public void setDetail(String detail) { - this.detail = detail; - } - - public String getInstance() { - return instance; - } - - public void setInstance(String instance) { - this.instance = instance; - } - - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java deleted file mode 100644 index 062a6aa32a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceChanges.java +++ /dev/null @@ -1,71 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class ResourceChanges { - private List<AffectedVnf> affectedVnfs; - private List<AffectedPnf> affectedPnfs; - private List<AffectedVirtualLink> affectedVls; - private List<AffectedVnffg> affectedVnffgs; - private List<AffectedNs> affectedNss; - private List<AffectedSap> affectedSaps; - - public List<AffectedVnf> getAffectedVnfs() { - return affectedVnfs; - } - - public void setAffectedVnfs(List<AffectedVnf> affectedVnfs) { - this.affectedVnfs = affectedVnfs; - } - - public List<AffectedPnf> getAffectedPnfs() { - return affectedPnfs; - } - - public void setAffectedPnfs(List<AffectedPnf> affectedPnfs) { - this.affectedPnfs = affectedPnfs; - } - - public List<AffectedVirtualLink> getAffectedVls() { - return affectedVls; - } - - public void setAffectedVls(List<AffectedVirtualLink> affectedVls) { - this.affectedVls = affectedVls; - } - - public List<AffectedVnffg> getAffectedVnffgs() { - return affectedVnffgs; - } - - public void setAffectedVnffgs(List<AffectedVnffg> affectedVnffgs) { - this.affectedVnffgs = affectedVnffgs; - } - - public List<AffectedNs> getAffectedNss() { - return affectedNss; - } - - public void setAffectedNss(List<AffectedNs> affectedNss) { - this.affectedNss = affectedNss; - } - - public List<AffectedSap> getAffectedSaps() { - return affectedSaps; - } - - public void setAffectedSaps(List<AffectedSap> affectedSaps) { - this.affectedSaps = affectedSaps; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java deleted file mode 100644 index fbfecaa007..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResourceHandle.java +++ /dev/null @@ -1,51 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class ResourceHandle { - private String vimId; - private String resourceProviderId; - private String resourceId; - private String vimLevelResourceType; - - public String getVimId() { - return vimId; - } - - public void setVimId(String vimId) { - this.vimId = vimId; - } - - public String getResourceProviderId() { - return resourceProviderId; - } - - public void setResourceProviderId(String resourceProviderId) { - this.resourceProviderId = resourceProviderId; - } - - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public String getVimLevelResourceType() { - return vimLevelResourceType; - } - - public void setVimLevelResourceType(String vimLevelResourceType) { - this.vimLevelResourceType = vimLevelResourceType; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java deleted file mode 100644 index 3ea51c107b..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ResponseDescriptor.java +++ /dev/null @@ -1,114 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * <br> - * <p> - * </p> - * response model of query operation status - * - * @author - * @version SDNO 0.5 September 3, 2016 - */ -public class ResponseDescriptor { - - String status; - - String progress; - - String statusDescription; - - Integer errorCode; - - Integer responseId; - - /** - * @return Returns the status. - */ - public String getStatus() { - return status; - } - - /** - * @param status The status to set. - */ - public void setStatus(String status) { - this.status = status; - } - - /** - * @return Returns the progress. - */ - public String getProgress() { - return progress; - } - - /** - * @param progress The progress to set. - */ - public void setProgress(String progress) { - this.progress = progress; - } - - /** - * @return Returns the statusDescription. - */ - public String getStatusDescription() { - return statusDescription; - } - - /** - * @param statusDescription The statusDescription to set. - */ - public void setStatusDescription(String statusDescription) { - this.statusDescription = statusDescription; - } - - /** - * @return Returns the errorCode. - */ - public Integer getErrorCode() { - return errorCode; - } - - /** - * @param errorCode The errorCode to set. - */ - public void setErrorCode(Integer errorCode) { - this.errorCode = errorCode; - } - - /** - * @return Returns the responseId. - */ - public Integer getResponseId() { - return responseId; - } - - /** - * @param responseId The responseId to set. - */ - public void setResponseId(Integer responseId) { - this.responseId = responseId; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java deleted file mode 100644 index 27c9a89282..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/RestfulResponse.java +++ /dev/null @@ -1,100 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.Map; - -/** - * The Unified Restful Reponse Class <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-09-06 - */ -public class RestfulResponse { - - // the response content - private String responseContent; - - // the response status - private int status; - - // the response header - private Map<String, String> respHeaderMap; - - public RestfulResponse() { - this.status = -1; - - this.respHeaderMap = null; - } - - public int getStatus() { - return this.status; - } - - public void setStatus(int status) { - this.status = status; - } - - public Map<String, String> getRespHeaderMap() { - return this.respHeaderMap; - } - - public void setRespHeaderMap(Map<String, String> header) { - this.respHeaderMap = header; - } - - public int getRespHeaderInt(String key) { - if (this.respHeaderMap != null) { - String result = this.respHeaderMap.get(key); - if (result != null) { - return Integer.parseInt(result); - } - } - return -1; - } - - public long getRespHeaderLong(String key) { - if (this.respHeaderMap != null) { - String result = this.respHeaderMap.get(key); - if (result != null) { - return Long.parseLong(result); - } - } - return -1L; - } - - public String getRespHeaderStr(String key) { - if (this.respHeaderMap != null) { - return this.respHeaderMap.get(key); - } - return null; - } - - public String getResponseContent() { - return this.responseContent; - } - - public void setResponseContent(String responseString) { - this.responseContent = responseString; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapData.java deleted file mode 100644 index d8e96e22f5..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapData.java +++ /dev/null @@ -1,56 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -public class SapData { - private String sapdId; - private String sapName; - private String description; - private List<CpProtocolData> sapProtocolData; - - public String getSapdId() { - return sapdId; - } - - public void setSapdId(String sapdId) { - this.sapdId = sapdId; - } - - public String getSapName() { - return sapName; - } - - public void setSapName(String sapName) { - this.sapName = sapName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public List<CpProtocolData> getSapProtocolData() { - return sapProtocolData; - } - - public void setSapProtocolData(List<CpProtocolData> sapProtocolData) { - this.sapProtocolData = sapProtocolData; - } - - - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java deleted file mode 100644 index 182aceb127..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/SapInfo.java +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class SapInfo { - @NotNull - private String id; - @NotNull - private String sapdId; - @NotNull - private String sapName; - @NotNull - private String description; - @NotNull - private List<CpProtocolInfo> sapProtocolInfo; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getSapdId() { - return sapdId; - } - - public void setSapdId(String sapdId) { - this.sapdId = sapdId; - } - - public String getSapName() { - return sapName; - } - - public void setSapName(String sapName) { - this.sapName = sapName; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public List<CpProtocolInfo> getSapProtocolInfo() { - return sapProtocolInfo; - } - - public void setSapProtocolInfo(List<CpProtocolInfo> sapProtocolInfo) { - this.sapProtocolInfo = sapProtocolInfo; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java deleted file mode 100644 index f9d6274643..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsByStepsData.java +++ /dev/null @@ -1,88 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 CMCC Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ -package org.onap.so.adapters.vfc.model; - -/** - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-9-26 - */ -public class ScaleNsByStepsData { - - /** - * scaling Direction - */ - private String scalingDirection; - - /** - * aspect ID - */ - private String aspectId; - - /** - * number of Steps - */ - private Integer numberOfSteps; - - /** - * @return Returns the scalingDirection. - */ - public String getScalingDirection() { - return scalingDirection; - } - - /** - * @param scalingDirection The scalingDirection to set. - */ - public void setScalingDirection(String scalingDirection) { - this.scalingDirection = scalingDirection; - } - - /** - * @return Returns the aspectId. - */ - public String getAspectId() { - return aspectId; - } - - /** - * @param aspectId The aspectId to set. - */ - public void setAspectId(String aspectId) { - this.aspectId = aspectId; - } - - /** - * @return Returns the numberOfSteps. - */ - public Integer getNumberOfSteps() { - return numberOfSteps; - } - - /** - * @param numberOfSteps The numberOfSteps to set. - */ - public void setNumberOfSteps(int numberOfSteps) { - this.numberOfSteps = numberOfSteps; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java deleted file mode 100644 index bd50827549..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/ScaleNsData.java +++ /dev/null @@ -1,48 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2018 CMCC Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.List; - -/** - * aim to wrap List<ScaleNsByStepsData> as a new list then be provided for the usage of vfc json - * - * added on 2018/01/30 by Qihui Zhao from CMCC - */ - -public class ScaleNsData { - - private List<ScaleNsByStepsData> scaleNsByStepsData; - - /** - * @return Returns the scaleNsByStepsData. - */ - public List<ScaleNsByStepsData> getScaleNsByStepsData() { - return scaleNsByStepsData; - } - - /** - * @param scaleNsByStepsData The scaleNsByStepsData to set. - */ - public void setScaleNsByStepsData(List<ScaleNsByStepsData> scaleNsByStepsData) { - this.scaleNsByStepsData = scaleNsByStepsData; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java deleted file mode 100644 index 1939fa4ec4..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VFCScaleData.java +++ /dev/null @@ -1,84 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2018 CMCC Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -import java.util.ArrayList; -import java.util.List; - -/** - * Object totally matches required VFC input json format JsonUtil.marshal will convert this Object to string - * - * added on 2018/01/30 by Qihui Zhao from CMCC - */ - -public class VFCScaleData { - - private String nsInstanceId; - - private String scaleType; - - private List<ScaleNsData> scaleNsData = new ArrayList<>(); - - /** - * @return Returns the nsInstanceId. - */ - public String getNsInstanceId() { - return nsInstanceId; - } - - /** - * @param nsInstanceId The nsInstanceId to set. - */ - public void setNsInstanceId(String nsInstanceId) { - this.nsInstanceId = nsInstanceId; - } - - /** - * @return Returns the scale Type. - */ - public String getScaleType() { - return scaleType; - } - - /** - * @param scaleType The scaleType to set. - */ - public void setScaleType(String scaleType) { - this.scaleType = scaleType; - } - - /** - * @return Returns the scaleNsDate. - */ - public List<ScaleNsData> getScaleNsData() { - return scaleNsData; - } - - /** - * The scaleNsData to set. - */ - public void setScaleNsData(List<ScaleNsByStepsData> scaleNsByStepsData) { - ScaleNsData scaleNsDataObj = new ScaleNsData(); - scaleNsDataObj.setScaleNsByStepsData(scaleNsByStepsData); - - this.scaleNsData.add(scaleNsDataObj); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java deleted file mode 100644 index 456835b431..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VimLocation.java +++ /dev/null @@ -1,51 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.model; - -/** - * - * <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-10-18 - */ -public class VimLocation { - private String vimId; - - - /** - * @return Returns the vimId. - */ - public String getVimId() { - return vimId; - } - - - /** - * @param vimId The vimId to set. - */ - public void setVimId(String vimId) { - this.vimId = vimId; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java deleted file mode 100644 index ccd6532ee0..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstance.java +++ /dev/null @@ -1,156 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.Map; - -public class VnfInstance { - @NotNull - private String id; - private String vnfInstanceName; - private String vnfInstanceDescription; - @NotNull - private String vnfdId; - @NotNull - private String vnfProvider; - @NotNull - private String vnfProductName; - @NotNull - private String vnfSoftwareVersion; - @NotNull - private String vnfdVersion; - @NotNull - private String vnfPkgId; - private Map<String, Object> vnfConfigurableProperties; - private String vimId; - - private enum instantiationState { - NOT_INSTANTIATED, INSTANTIATED - }; - - private InstantiatedVnfInfo instantiatedVnfInfo; - private Map<String, Object> metadata; - private Map<String, Object> extensions; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getVnfInstanceName() { - return vnfInstanceName; - } - - public void setVnfInstanceName(String vnfInstanceName) { - this.vnfInstanceName = vnfInstanceName; - } - - public String getVnfInstanceDescription() { - return vnfInstanceDescription; - } - - public void setVnfInstanceDescription(String vnfInstanceDescription) { - this.vnfInstanceDescription = vnfInstanceDescription; - } - - public String getVnfdId() { - return vnfdId; - } - - public void setVnfdId(String vnfdId) { - this.vnfdId = vnfdId; - } - - public String getVnfProvider() { - return vnfProvider; - } - - public void setVnfProvider(String vnfProvider) { - this.vnfProvider = vnfProvider; - } - - public String getVnfProductName() { - return vnfProductName; - } - - public void setVnfProductName(String vnfProductName) { - this.vnfProductName = vnfProductName; - } - - public String getVnfSoftwareVersion() { - return vnfSoftwareVersion; - } - - public void setVnfSoftwareVersion(String vnfSoftwareVersion) { - this.vnfSoftwareVersion = vnfSoftwareVersion; - } - - public String getVnfdVersion() { - return vnfdVersion; - } - - public void setVnfdVersion(String vnfdVersion) { - this.vnfdVersion = vnfdVersion; - } - - public String getVnfPkgId() { - return vnfPkgId; - } - - public void setVnfPkgId(String vnfPkgId) { - this.vnfPkgId = vnfPkgId; - } - - public Map<String, Object> getVnfConfigurableProperties() { - return vnfConfigurableProperties; - } - - public void setVnfConfigurableProperties(Map<String, Object> vnfConfigurableProperties) { - this.vnfConfigurableProperties = vnfConfigurableProperties; - } - - public String getVimId() { - return vimId; - } - - public void setVimId(String vimId) { - this.vimId = vimId; - } - - public InstantiatedVnfInfo getInstantiatedVnfInfo() { - return instantiatedVnfInfo; - } - - public void setInstantiatedVnfInfo(InstantiatedVnfInfo instantiatedVnfInfo) { - this.instantiatedVnfInfo = instantiatedVnfInfo; - } - - public Map<String, Object> getMetadata() { - return metadata; - } - - public void setMetadata(Map<String, Object> metadata) { - this.metadata = metadata; - } - - public Map<String, Object> getExtensions() { - return extensions; - } - - public void setExtensions(Map<String, Object> extensions) { - this.extensions = extensions; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java deleted file mode 100644 index 83345fcb4c..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfInstanceData.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class VnfInstanceData { - private String vnfInstanceId; - private String vnfProfileId; - - public String getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(String vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } - - public String getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java deleted file mode 100644 index 0b09d066fa..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLinkPortInfo.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class VnfLinkPortInfo { - @NotNull - private String id; - @NotNull - private ResourceHandle resourceHandle; - private String cpInstanceId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public ResourceHandle getResourceHandle() { - return resourceHandle; - } - - public void setResourceHandle(ResourceHandle resourceHandle) { - this.resourceHandle = resourceHandle; - } - - public String getCpInstanceId() { - return cpInstanceId; - } - - public void setCpInstanceId(String cpInstanceId) { - this.cpInstanceId = cpInstanceId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java deleted file mode 100644 index 5db3060b88..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfLocationConstraint.java +++ /dev/null @@ -1,33 +0,0 @@ -/*** - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -public class VnfLocationConstraint { - private String vnfProfileId; - private LocationConstraint locationConstraints; - - public String getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - public LocationConstraint getLocationConstraints() { - return locationConstraints; - } - - public void setLocationConstraints(LocationConstraint locationConstraints) { - this.locationConstraints = locationConstraints; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java deleted file mode 100644 index e702edc821..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfScaleInfo.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; - -public class VnfScaleInfo { - @NotNull - private String aspectlId; - @NotNull - private int scaleLevel; - - public String getAspectlId() { - return aspectlId; - } - - public void setAspectlId(String aspectlId) { - this.aspectlId = aspectlId; - } - - public int getScaleLevel() { - return scaleLevel; - } - - public void setScaleLevel(int scaleLevel) { - this.scaleLevel = scaleLevel; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java deleted file mode 100644 index 9f41a383fc..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfVirtualLinkResourceInfo.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Map; - -public class VnfVirtualLinkResourceInfo { - @NotNull - private String id; - @NotNull - private String virtualLinkDescId; - @NotNull - private ResourceHandle networkResource; - private String reservationId; - private List<VnfLinkPortInfo> vnfLinkPorts; - Map<String, Object> metadata; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getVirtualLinkDescId() { - return virtualLinkDescId; - } - - public void setVirtualLinkDescId(String virtualLinkDescId) { - this.virtualLinkDescId = virtualLinkDescId; - } - - public ResourceHandle getNetworkResource() { - return networkResource; - } - - public void setNetworkResource(ResourceHandle networkResource) { - this.networkResource = networkResource; - } - - public String getReservationId() { - return reservationId; - } - - public void setReservationId(String reservationId) { - this.reservationId = reservationId; - } - - public List<VnfLinkPortInfo> getVnfLinkPorts() { - return vnfLinkPorts; - } - - public void setVnfLinkPorts(List<VnfLinkPortInfo> vnfLinkPorts) { - this.vnfLinkPorts = vnfLinkPorts; - } - - public Map<String, Object> getMetadata() { - return metadata; - } - - public void setMetadata(Map<String, Object> metadata) { - this.metadata = metadata; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java deleted file mode 100644 index ec629effd2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcCpInfo.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class VnfcCpInfo { - @NotNull - private String id; - @NotNull - private String cpdId; - private String vnfExtCpId; - private List<CpProtocolInfo> cpProtocolInfo; - private String vnfLinkPortId; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getCpdId() { - return cpdId; - } - - public void setCpdId(String cpdId) { - this.cpdId = cpdId; - } - - public String getVnfExtCpId() { - return vnfExtCpId; - } - - public void setVnfExtCpId(String vnfExtCpId) { - this.vnfExtCpId = vnfExtCpId; - } - - public List<CpProtocolInfo> getCpProtocolInfo() { - return cpProtocolInfo; - } - - public void setCpProtocolInfo(List<CpProtocolInfo> cpProtocolInfo) { - this.cpProtocolInfo = cpProtocolInfo; - } - - public String getVnfLinkPortId() { - return vnfLinkPortId; - } - - public void setVnfLinkPortId(String vnfLinkPortId) { - this.vnfLinkPortId = vnfLinkPortId; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java deleted file mode 100644 index 1f7aa67b8d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnfcResourceInfo.java +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; -import java.util.Map; - -public class VnfcResourceInfo { - @NotNull - private String id; - @NotNull - private String vduId; - @NotNull - private ResourceHandle computeResource; - private List<String> storageResourceIds; - private String reservationId; - private List<VnfcCpInfo> vnfcCpInfo; - private Map<String, Object> metadata; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getVduId() { - return vduId; - } - - public void setVduId(String vduId) { - this.vduId = vduId; - } - - public ResourceHandle getComputeResource() { - return computeResource; - } - - public void setComputeResource(ResourceHandle computeResource) { - this.computeResource = computeResource; - } - - public List<String> getStorageResourceIds() { - return storageResourceIds; - } - - public void setStorageResourceIds(List<String> storageResourceIds) { - this.storageResourceIds = storageResourceIds; - } - - public String getReservationId() { - return reservationId; - } - - public void setReservationId(String reservationId) { - this.reservationId = reservationId; - } - - public List<VnfcCpInfo> getVnfcCpInfo() { - return vnfcCpInfo; - } - - public void setVnfcCpInfo(List<VnfcCpInfo> vnfcCpInfo) { - this.vnfcCpInfo = vnfcCpInfo; - } - - public Map<String, Object> getMetadata() { - return metadata; - } - - public void setMetadata(Map<String, Object> metadata) { - this.metadata = metadata; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java deleted file mode 100644 index c02d5177db..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/model/VnffgInfo.java +++ /dev/null @@ -1,87 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.model; - -import javax.validation.constraints.NotNull; -import java.util.List; - -public class VnffgInfo { - @NotNull - private String id; - @NotNull - private String vnffgdId; - @NotNull - private List<String> vnfInstanceId; - private String pnfInfoId; - @NotNull - private List<String> nsVirtualLinkInfoId; - @NotNull - private List<NsCpHandle> nsCpHandle; - @NotNull - private List<NfpInfo> nfpInfo; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getVnffgdId() { - return vnffgdId; - } - - public void setVnffgdId(String vnffgdId) { - this.vnffgdId = vnffgdId; - } - - public List<String> getVnfInstanceId() { - return vnfInstanceId; - } - - public void setVnfInstanceId(List<String> vnfInstanceId) { - this.vnfInstanceId = vnfInstanceId; - } - - public String getPnfInfoId() { - return pnfInfoId; - } - - public void setPnfInfoId(String pnfInfoId) { - this.pnfInfoId = pnfInfoId; - } - - public List<String> getNsVirtualLinkInfoId() { - return nsVirtualLinkInfoId; - } - - public void setNsVirtualLinkInfoId(List<String> nsVirtualLinkInfoId) { - this.nsVirtualLinkInfoId = nsVirtualLinkInfoId; - } - - public List<NsCpHandle> getNsCpHandle() { - return nsCpHandle; - } - - public void setNsCpHandle(List<NsCpHandle> nsCpHandle) { - this.nsCpHandle = nsCpHandle; - } - - public List<NfpInfo> getNfpInfo() { - return nfpInfo; - } - - public void setNfpInfo(List<NfpInfo> nfpInfo) { - this.nfpInfo = nfpInfo; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java deleted file mode 100644 index 7f81dfbdaf..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/AaiUtil.java +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.rest; - -import org.onap.so.adapters.vfc.model.RestfulResponse; - -/** - * Implement class of operating aai database table <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -public class AaiUtil { - - public static RestfulResponse addRelation(String globalSubsriberId, String serviceType, String serviceInstanceId, - String resourceInstanceId) { - // sent rest to aai to add relation for service and ns. - - return null; - } - - public static RestfulResponse removeRelation(String globalSubsriberId, String serviceType, String serviceInstanceId, - String resourceInstanceId) { - // sent rest to aai to remove relation between service an ns. - return null; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java deleted file mode 100644 index 2dcdf11316..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/HealthCheckHandler.java +++ /dev/null @@ -1,58 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Modifications Copyright (c) 2019 Samsung - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.rest; - -import javax.ws.rs.HEAD; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import org.apache.http.HttpStatus; -import org.springframework.stereotype.Component; - -/** - * Health Check <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -@Path("/") -@Component -public class HealthCheckHandler { - - - private static final String CHECK_HTML = - "<!DOCTYPE html><html><head><meta charset=\"ISO-8859-1\"><title>Health Check</title></head><body>Application ready</body></html>"; - - public static final Response HEALTH_CHECK_RESPONSE = Response.status(HttpStatus.SC_OK).entity(CHECK_HTML).build(); - - @HEAD - @Path("/healthcheck") - @Produces("text/html") - public Response healthcheck(@QueryParam("requestId") String requestId) { - return HEALTH_CHECK_RESPONSE; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java deleted file mode 100644 index 5a89c04a5a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcAdapterRest.java +++ /dev/null @@ -1,265 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2018 IBM. - * Modifications Copyright (c) 2019 Samsung - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.rest; - -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import org.onap.so.adapters.vfc.exceptions.ApplicationException; -import org.onap.so.adapters.vfc.model.NSResourceInputParameter; -import org.onap.so.adapters.vfc.model.NsOperationKey; -import org.onap.so.adapters.vfc.model.RestfulResponse; -import org.onap.so.adapters.vfc.util.JsonUtil; -import org.onap.so.adapters.vfc.util.ValidateUtil; -import org.onap.so.db.request.beans.InstanceNfvoMapping; -import org.onap.so.db.request.data.repository.InstanceNfvoMappingRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * The rest class for VF-c Adapter <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -@Component -@Path("/v1/vfcadapter") -public class VfcAdapterRest { - - private static final Logger logger = LoggerFactory.getLogger(VfcAdapterRest.class); - private static final String REQUEST_DEBUG_MSG = "body from request is {}"; - private static final String APPLICATION_EXCEPTION = "ApplicationException: "; - @Autowired - private VfcManagerSol005 vfcManagerSol005; - - @Autowired - private VfcManager driverMgr; - @Autowired - private InstanceNfvoMappingRepository instanceNfvoMappingRepository; - - public VfcAdapterRest() { - - } - - /** - * Create a NS <br> - * - * @param data http request - * @return - * @since ONAP Amsterdam Release - */ - @POST - @Path("/ns") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response createNfvoNs(String data) { - try { - ValidateUtil.assertObjectNotNull(data); - logger.debug(REQUEST_DEBUG_MSG + data); - NSResourceInputParameter nsInput = JsonUtil.unMarshal(data, NSResourceInputParameter.class); - RestfulResponse rsp; - if (nsInput.getNsParameters().getAdditionalParamForNs().containsKey("isSol005Interface")) { - rsp = vfcManagerSol005.createNs(nsInput); - } else { - rsp = driverMgr.createNs(nsInput); - } - - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - /** - * Delete NS instance<br> - * - * @param data The http request - * @param nsInstanceId The NS instance id - * @return response - * @since ONAP Amsterdam Release - */ - @DELETE - @Path("/ns/{nsInstanceId}") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response deleteNfvoNs(String data, @PathParam("nsInstanceId") String nsInstanceId) { - try { - - ValidateUtil.assertObjectNotNull(data); - logger.debug(REQUEST_DEBUG_MSG + data); - NsOperationKey nsOperationKey = JsonUtil.unMarshal(data, NsOperationKey.class); - RestfulResponse rsp; - InstanceNfvoMapping instanceNfvoMapping = instanceNfvoMappingRepository.findOneByInstanceId(nsInstanceId); - if (instanceNfvoMapping != null) { - rsp = vfcManagerSol005.deleteNs(nsOperationKey, nsInstanceId); - } else { - rsp = driverMgr.deleteNs(nsOperationKey, nsInstanceId); - } - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - /** - * Query Operation job status <br> - * - * @param data The Http Request - * @param jobId The job id - * @return - * @since ONAP Amsterdam Release - */ - @POST - @Path("/jobs/{jobId}") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response queryNfvoJobStatus(String data, @PathParam("jobId") String jobId) { - try { - ValidateUtil.assertObjectNotNull(data); - logger.debug(REQUEST_DEBUG_MSG + data); - NsOperationKey nsOperationKey = JsonUtil.unMarshal(data, NsOperationKey.class); - RestfulResponse rsp; - InstanceNfvoMapping instanceNfvoMapping = instanceNfvoMappingRepository.findOneByJobId(jobId); - if (instanceNfvoMapping != null) { - rsp = vfcManagerSol005.getNsProgress(nsOperationKey, jobId); - } else { - rsp = driverMgr.getNsProgress(nsOperationKey, jobId); - } - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - /** - * Instantiate NS instance <br> - * - * @param data The http request - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Amsterdam Release - */ - @POST - @Path("/ns/{nsInstanceId}/instantiate") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response instantiateNfvoNs(String data, @PathParam("nsInstanceId") String nsInstanceId) { - try { - ValidateUtil.assertObjectNotNull(data); - logger.debug(REQUEST_DEBUG_MSG + data); - NSResourceInputParameter nsInput = JsonUtil.unMarshal(data, NSResourceInputParameter.class); - RestfulResponse rsp; - if (nsInput.getNsParameters().getAdditionalParamForNs().containsKey("isSol005Interface")) { - rsp = vfcManagerSol005.instantiateNs(nsInstanceId, nsInput); - } else { - rsp = driverMgr.instantiateNs(nsInstanceId, nsInput); - } - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - /** - * Terminate NS instance <br> - * - * @param data The http request - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Amsterdam Release - */ - @POST - @Path("/ns/{nsInstanceId}/terminate") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response terminateNfvoNs(String data, @PathParam("nsInstanceId") String nsInstanceId) { - try { - ValidateUtil.assertObjectNotNull(data); - logger.debug(REQUEST_DEBUG_MSG + data); - NsOperationKey nsOperationKey = JsonUtil.unMarshal(data, NsOperationKey.class); - RestfulResponse rsp; - InstanceNfvoMapping instanceNfvoMapping = instanceNfvoMappingRepository.findOneByInstanceId(nsInstanceId); - if (instanceNfvoMapping != null) { - rsp = vfcManagerSol005.terminateNs(nsOperationKey, nsInstanceId); - } else { - rsp = driverMgr.terminateNs(nsOperationKey, nsInstanceId); - } - - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - /** - * Scale NS instance <br> - * - * @param servletReq The http request - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Amsterdam Release - */ - @POST - @Path("/ns/{nsInstanceId}/scale") - @Consumes({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - @Produces({MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON}) - public Response scaleNfvoNs(String data, @PathParam("nsInstanceId") String nsInstanceId) { - try { - ValidateUtil.assertObjectNotNull(data); - logger.debug("Scale Ns Request Received.Body from request is {}" + data); - NSResourceInputParameter nsInput = JsonUtil.unMarshal(data, NSResourceInputParameter.class); - RestfulResponse rsp = driverMgr.scaleNs(nsInstanceId, nsInput); - return buildResponse(rsp); - } catch (ApplicationException e) { - logger.debug(APPLICATION_EXCEPTION, e); - return e.buildErrorResponse(); - } - } - - - /** - * build response from restful response <br> - * - * @param rsp general response object - * @return - * @since ONAP Amsterdam Release - */ - private Response buildResponse(RestfulResponse rsp) { - return Response.status(rsp.getStatus()).entity(rsp.getResponseContent()).build(); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java deleted file mode 100644 index b817b5bf9a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManager.java +++ /dev/null @@ -1,492 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.rest; - -import java.util.HashMap; -import java.util.Map; -import org.onap.so.adapters.vfc.constant.CommonConstant; -import org.onap.so.adapters.vfc.constant.CommonConstant.Step; -import org.onap.so.adapters.vfc.constant.DriverExceptionID; -import org.onap.so.adapters.vfc.constant.HttpCode; -import org.onap.so.adapters.vfc.exceptions.ApplicationException; -import org.onap.so.adapters.vfc.model.CustomerModel; -import org.onap.so.adapters.vfc.model.NSResourceInputParameter; -import org.onap.so.adapters.vfc.model.NsCreateReq; -import org.onap.so.adapters.vfc.model.NsInstantiateReq; -import org.onap.so.adapters.vfc.model.NsOperationKey; -import org.onap.so.adapters.vfc.model.NsParameters; -import org.onap.so.adapters.vfc.model.NsProgressStatus; -import org.onap.so.adapters.vfc.model.NsScaleParameters; -import org.onap.so.adapters.vfc.model.ResponseDescriptor; -import org.onap.so.adapters.vfc.model.RestfulResponse; -import org.onap.so.adapters.vfc.model.VFCScaleData; -import org.onap.so.adapters.vfc.util.JsonUtil; -import org.onap.so.adapters.vfc.util.RestfulUtil; -import org.onap.so.adapters.vfc.util.ValidateUtil; -import org.onap.so.db.request.beans.ResourceOperationStatus; -import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository; -import org.onap.so.requestsdb.RequestsDbConstant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.data.domain.Example; -import org.springframework.stereotype.Component; - -/** - * VF-C Manager <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -@Component -@Primary -public class VfcManager { - - private static final Logger LOGGER = LoggerFactory.getLogger(VfcManager.class); - - /** - * nfvo url map - */ - private Map<String, String> nfvoUrlMap; - - @Autowired - private ResourceOperationStatusRepository resourceOperationStatusRepository; - - @Autowired - private RestfulUtil restfulUtil; - - - public VfcManager() { - nfvoUrlMap = new HashMap<>(); - nfvoUrlMap.put(Step.CREATE, CommonConstant.NFVO_CREATE_URL); - nfvoUrlMap.put(Step.INSTANTIATE, CommonConstant.NFVO_INSTANTIATE_URL); - nfvoUrlMap.put(Step.TERMINATE, CommonConstant.NFVO_TERMINATE_URL); - nfvoUrlMap.put(Step.DELETE, CommonConstant.NFVO_DELETE_URL); - nfvoUrlMap.put(Step.QUERY, CommonConstant.NFVO_QUERY_URL); - nfvoUrlMap.put(Step.SCALE, CommonConstant.NFVO_SCALE_URL); - } - - /** - * create network service <br> - * - * @param segInput input parameters for current node from http request - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse createNs(NSResourceInputParameter segInput) throws ApplicationException { - - // Step1: get service template by node type - String csarId = segInput.getNsServiceModelUUID(); - // nsdId for NFVO is "id" in the response, while for SDNO is "servcice template id" - LOGGER.info("serviceTemplateId is {}, id is {}", csarId, csarId); - - LOGGER.info("create ns -> begin"); - // Step2: Prepare url and method type - String url = getUrl(null, CommonConstant.Step.CREATE); - String methodType = CommonConstant.MethodType.POST; - - // Step3: Prepare restful parameters and options - NsCreateReq oRequest = new NsCreateReq(); - oRequest.setCsarId(csarId); - oRequest.setNsName(segInput.getNsServiceName()); - oRequest.setDescription(segInput.getNsServiceDescription()); - CustomerModel context = new CustomerModel(); - context.setGlobalCustomerId(segInput.getNsOperationKey().getGlobalSubscriberId()); - context.setServiceType(segInput.getNsOperationKey().getServiceType()); - oRequest.setContext(context); - String createReq = JsonUtil.marshal(oRequest); - - // Step4: Call NFVO or SDNO lcm to create ns - RestfulResponse createRsp = restfulUtil.send(url, methodType, createReq); - ValidateUtil.assertObjectNotNull(createRsp); - LOGGER.info("create ns response status is : {}", createRsp.getStatus()); - LOGGER.info("create ns response content is : {}", createRsp.getResponseContent()); - - // Step 5: save resource operation information - ResourceOperationStatus status = new ResourceOperationStatus(segInput.getNsOperationKey().getServiceId(), - segInput.getNsOperationKey().getOperationId(), segInput.getNsOperationKey().getNodeTemplateUUID()); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - status = resourceOperationStatusRepository.save(status); - if (!HttpCode.isSucess(createRsp.getStatus())) { - LOGGER.error("update segment operation status : fail to create ns"); - status.setProgress("40"); - status.setStatusDescription("NS is created"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(createRsp.getStatus())); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_CREATE_NS); - } - @SuppressWarnings("unchecked") - Map<String, String> rsp = JsonUtil.unMarshal(createRsp.getResponseContent(), Map.class); - String nsInstanceId = rsp.get(CommonConstant.NS_INSTANCE_ID); - if (ValidateUtil.isStrEmpty(nsInstanceId)) { - LOGGER.error("Invalid instanceId from create operation"); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSEE_FROM_CREATE_OPERATION); - } - LOGGER.info("create ns -> end"); - LOGGER.info("save segment and operaton info -> begin"); - // Step 6: add relation between service and NS - AaiUtil.addRelation(segInput.getNsOperationKey().getGlobalSubscriberId(), - segInput.getNsOperationKey().getServiceType(), segInput.getNsOperationKey().getServiceId(), - nsInstanceId); - LOGGER.info("save segment and operation info -> end"); - return createRsp; - } - - /** - * delete network service <br> - * - * @param nsOperationKey The operation key of the NS resource - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse deleteNs(NsOperationKey nsOperationKey, String nsInstanceId) throws ApplicationException { - LOGGER.info("delete ns -> begin"); - // Step1: prepare url and methodType - String url = getUrl(nsInstanceId, CommonConstant.Step.DELETE); - String methodType = CommonConstant.MethodType.DELETE; - - // Step2: prepare restful parameters and options - RestfulResponse deleteRsp = restfulUtil.send(url, methodType, ""); - ValidateUtil.assertObjectNotNull(deleteRsp); - LOGGER.info("delete ns response status is : {}", deleteRsp.getStatus()); - LOGGER.info("delete ns response content is : {}", deleteRsp.getResponseContent()); - LOGGER.info("delete ns -> end"); - - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - if (!HttpCode.isSucess(deleteRsp.getStatus())) { - LOGGER.error("fail to delete ns"); - - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(deleteRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_DELETE_NS); - } - - // Step3: remove relation info between service and ns - AaiUtil.removeRelation(nsOperationKey.getGlobalSubscriberId(), nsOperationKey.getServiceType(), - nsOperationKey.getServiceId(), nsInstanceId); - LOGGER.info("delete segment information -> end"); - - // Step4: update service segment operation status - status.setStatus(RequestsDbConstant.Status.FINISHED); - status.setErrorCode(String.valueOf(deleteRsp.getStatus())); - status.setProgress("100"); - status.setStatusDescription("VFC resource deletion finished"); - resourceOperationStatusRepository.save(status); - LOGGER.info("update segment operaton status for delete -> end"); - - return deleteRsp; - - } - - /** - * instantiate network service <br> - * - * @param nsInstanceId The NS instance id - * @param segInput input parameters for current node from http request - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse instantiateNs(String nsInstanceId, NSResourceInputParameter segInput) - throws ApplicationException { - // Call the NFVO or SDNO service to instantiate service - LOGGER.info("instantiate ns -> begin"); - - // Step1: Prepare restful parameters and options - NsInstantiateReq oRequest = new NsInstantiateReq(); - oRequest.setNsInstanceId(nsInstanceId); - NsParameters nsParameters = segInput.getNsParameters(); - oRequest.setLocationConstraints(nsParameters.getLocationConstraints()); - oRequest.setAdditionalParamForNs(nsParameters.getAdditionalParamForNs()); - String instReq = JsonUtil.marshal(oRequest); - // Step2: prepare url and - String url = getUrl(nsInstanceId, CommonConstant.Step.INSTANTIATE); - String methodType = CommonConstant.MethodType.POST; - - RestfulResponse instRsp = restfulUtil.send(url, methodType, instReq); - ResourceOperationStatus status = new ResourceOperationStatus(segInput.getNsOperationKey().getServiceId(), - segInput.getNsOperationKey().getOperationId(), segInput.getNsOperationKey().getNodeTemplateUUID()); - ValidateUtil.assertObjectNotNull(instRsp); - if (!HttpCode.isSucess(instRsp.getStatus())) { - LOGGER.error("update segment operation status : fail to instantiate ns"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(instRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } - LOGGER.info("instantiate ns response status is : {}", instRsp.getStatus()); - LOGGER.info("instantiate ns response content is : {}", instRsp.getResponseContent()); - ValidateUtil.assertObjectNotNull(instRsp.getResponseContent()); - @SuppressWarnings("unchecked") - Map<String, String> rsp = JsonUtil.unMarshal(instRsp.getResponseContent(), Map.class); - String jobId = rsp.get(CommonConstant.JOB_ID); - if (ValidateUtil.isStrEmpty(jobId)) { - LOGGER.error("Invalid jobId from instantiate operation"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(instRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSE_FROM_INSTANTIATE_OPERATION); - } - LOGGER.info("instantiate ns -> end"); - // Step 3: update segment operation job id - LOGGER.info("update resource operation status job id -> begin"); - status.setJobId(jobId); - status.setProgress("100"); - status.setStatusDescription("NS initiation completed."); - resourceOperationStatusRepository.save(status); - LOGGER.info("update segment operation job id -> end"); - - return instRsp; - } - - /** - * terminate network service <br> - * - * @param nsOperationKey The operation key for NS resource - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse terminateNs(NsOperationKey nsOperationKey, String nsInstanceId) throws ApplicationException { - // Step1: save segment operation info for delete process - LOGGER.info("save segment operation for delete process"); - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - resourceOperationStatusRepository.save(status); - - LOGGER.info("terminate ns -> begin"); - // Step2: prepare url and method type - String url = getUrl(nsInstanceId, CommonConstant.Step.TERMINATE); - String methodType = CommonConstant.MethodType.POST; - - // Step3: prepare restful parameters and options - Map<String, String> reqBody = new HashMap<>(); - reqBody.put("nsInstanceId", nsInstanceId); - reqBody.put("terminationType", "graceful"); - reqBody.put("gracefulTerminationTimeout", "60"); - - // Step4: Call the NFVO or SDNO service to terminate service - RestfulResponse terminateRsp = restfulUtil.send(url, methodType, JsonUtil.marshal(reqBody)); - ValidateUtil.assertObjectNotNull(terminateRsp); - LOGGER.info("terminate ns response status is : {}", terminateRsp.getStatus()); - LOGGER.info("terminate ns response content is : {}", terminateRsp.getResponseContent()); - // Step 3: update segment operation - if (!HttpCode.isSucess(terminateRsp.getStatus())) { - LOGGER.error("fail to instantiate ns"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(terminateRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } - @SuppressWarnings("unchecked") - Map<String, String> rsp = JsonUtil.unMarshal(terminateRsp.getResponseContent(), Map.class); - String jobId = rsp.get(CommonConstant.JOB_ID); - if (ValidateUtil.isStrEmpty(jobId)) { - LOGGER.error("Invalid jobId from terminate operation"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(terminateRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSE_FROM_TERMINATE_OPERATION); - } - LOGGER.info("terminate ns -> end"); - - LOGGER.info("update segment job id -> begin"); - status.setProgress("60"); - status.setStatusDescription("NS is termination completed"); - status.setJobId(jobId); - resourceOperationStatusRepository.save(status); - LOGGER.info("update segment job id -> end"); - - return terminateRsp; - } - - /** - * get ns progress by job Id <br> - * - * @param nsOperationKey The OperationKey for NS resource - * @param jobId the job id - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse getNsProgress(NsOperationKey nsOperationKey, String jobId) throws ApplicationException { - - ValidateUtil.assertObjectNotNull(jobId); - // Step 1: query the current resource operation status - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - status = resourceOperationStatusRepository.findOne(Example.of(status)) - .orElseThrow(() -> new ApplicationException(404, "Cannot Find Operation Status")); - // Step 2: start query - LOGGER.info("query ns status -> begin"); - String url = getUrl(jobId, CommonConstant.Step.QUERY); - String methodType = CommonConstant.MethodType.GET; - // prepare restful parameters and options - RestfulResponse rsp = restfulUtil.send(url, methodType, ""); - ValidateUtil.assertObjectNotNull(rsp); - LOGGER.info("query ns progress response status is : {}", rsp.getStatus()); - LOGGER.info("query ns progress response content is : {}", rsp.getResponseContent()); - // Step 3:check the response staus - if (!HttpCode.isSucess(rsp.getStatus())) { - LOGGER.info("fail to query job status"); - status.setErrorCode(String.valueOf(rsp.getStatus())); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setStatusDescription(CommonConstant.StatusDesc.QUERY_JOB_STATUS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_QUERY_JOB_STATUS); - } - // Step 4: Process Network Service Instantiate Response - NsProgressStatus nsProgress = JsonUtil.unMarshal(rsp.getResponseContent(), NsProgressStatus.class); - ResponseDescriptor rspDesc = nsProgress.getResponseDescriptor(); - // Step 5: update segment operation progress - - status.setProgress(rspDesc.getProgress()); - status.setStatusDescription(rspDesc.getStatusDescription()); - resourceOperationStatusRepository.save(status); - - // Step 6: update segment operation status - if (RequestsDbConstant.Progress.ONE_HUNDRED.equals(rspDesc.getProgress()) - && RequestsDbConstant.Status.FINISHED.equals(rspDesc.getStatus())) { - LOGGER.info("job result is succeeded, operType is {}", status.getOperType()); - status.setErrorCode(String.valueOf(rsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.QUERY_JOB_STATUS_FAILED); - - if (RequestsDbConstant.OperationType.CREATE.equalsIgnoreCase(status.getOperType()) - || "createInstance".equalsIgnoreCase(status.getOperType())) { - status.setStatus(RequestsDbConstant.Status.FINISHED); - } - resourceOperationStatusRepository.save(status); - } else if (RequestsDbConstant.Status.ERROR.equals(rspDesc.getStatus())) { - LOGGER.error("job result is failed, operType is {}", status.getOperType()); - status.setErrorCode(String.valueOf(rsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.QUERY_JOB_STATUS_FAILED); - status.setStatus(RequestsDbConstant.Status.ERROR); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.JOB_STATUS_ERROR); - } else { - LOGGER.error("unexcepted response status"); - } - LOGGER.info("query ns status -> end"); - - return rsp; - } - - /** - * Scale NS instance <br> - * - * @param nsInstanceId The NS instance id - * @param segInput input parameters for current node from http request - * @return - * @since ONAP Amsterdam Release - */ - public RestfulResponse scaleNs(String nsInstanceId, NSResourceInputParameter segInput) throws ApplicationException { - // Call the NFVO to scale service - LOGGER.info("scale ns -> begin"); - - // Step1: Prepare restful parameters and options - VFCScaleData oRequest = new VFCScaleData(); - oRequest.setNsInstanceId(nsInstanceId); - NsScaleParameters nsScaleParameters = segInput.getNsScaleParameters(); - oRequest.setScaleType(nsScaleParameters.getScaleType()); - oRequest.setScaleNsData(nsScaleParameters.getScaleNsByStepsData()); - String scaleReq = JsonUtil.marshal(oRequest); - - // Step2: prepare url and method type - String url = getUrl(nsInstanceId, CommonConstant.Step.SCALE); - String methodType = CommonConstant.MethodType.POST; - LOGGER.info("scale ns request is {}", scaleReq); - // Step3: Call NFVO lcm to scale ns - RestfulResponse scaleRsp = restfulUtil.send(url, methodType, scaleReq); - - ResourceOperationStatus status = new ResourceOperationStatus(segInput.getNsOperationKey().getServiceId(), - segInput.getNsOperationKey().getOperationId(), segInput.getNsOperationKey().getNodeTemplateUUID()); - ResourceOperationStatus nsOperInfo = resourceOperationStatusRepository.findOne(Example.of(status)) - .orElseThrow(() -> new ApplicationException(404, "Cannot Find Operation Status")); - ValidateUtil.assertObjectNotNull(scaleRsp); - if (!HttpCode.isSucess(scaleRsp.getStatus())) { - LOGGER.error("update segment operation status : fail to scale ns"); - nsOperInfo.setStatus(RequestsDbConstant.Status.ERROR); - nsOperInfo.setErrorCode(String.valueOf(scaleRsp.getStatus())); - nsOperInfo.setStatusDescription(CommonConstant.StatusDesc.SCALE_NS_FAILED); - resourceOperationStatusRepository.save(nsOperInfo); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_SCALE_NS); - } - LOGGER.info("scale ns response status is {}", scaleRsp.getStatus()); - LOGGER.info("scale ns response content is {}", scaleRsp.getResponseContent()); - - ValidateUtil.assertObjectNotNull(scaleRsp.getResponseContent()); - @SuppressWarnings("unchecked") - Map<String, String> rsp = JsonUtil.unMarshal(scaleRsp.getResponseContent(), Map.class); - String jobId = rsp.get(CommonConstant.JOB_ID); - if (ValidateUtil.isStrEmpty(jobId)) { - LOGGER.error("Invalid jobId from scale operation"); - nsOperInfo.setStatus(RequestsDbConstant.Status.ERROR); - nsOperInfo.setErrorCode(String.valueOf(scaleRsp.getStatus())); - nsOperInfo.setStatusDescription(CommonConstant.StatusDesc.SCALE_NS_FAILED); - resourceOperationStatusRepository.save(nsOperInfo); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSE_FROM_SCALE_OPERATION); - } - - LOGGER.info("update resource operation status job id -> begin"); - // Step 4: update segment operation job id - nsOperInfo.setJobId(jobId); - resourceOperationStatusRepository.save(nsOperInfo); - LOGGER.info("update segment operation job id -> end"); - LOGGER.info("scale ns -> end"); - - return scaleRsp; - } - - /** - * get url for the operation <br> - * - * @param variable variable should be put in the url - * @param step step of the operation (terminate,query,delete) - * @return - * @since ONAP Amsterdam Release - */ - private String getUrl(String variable, String step) { - - String url; - String originalUrl; - originalUrl = nfvoUrlMap.get(step); - url = String.format(originalUrl, variable); - return url; - - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java deleted file mode 100644 index 9033becf8a..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/rest/VfcManagerSol005.java +++ /dev/null @@ -1,620 +0,0 @@ -/* - * Copyright (C) 2019 Verizon. All Rights Reserved Licensed under the Apache License, Version 2.0 (the "License"); you - * may not use this file except in compliance with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on - * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the - * specific language governing permissions and limitations under the License. - */ - -package org.onap.so.adapters.vfc.rest; - -import java.time.LocalDateTime; -import java.util.*; -import org.onap.so.adapters.vfc.constant.CommonConstant; -import org.onap.so.adapters.vfc.constant.CommonConstant.Step; -import org.onap.so.adapters.vfc.constant.DriverExceptionID; -import org.onap.so.adapters.vfc.constant.HttpCode; -import org.onap.so.adapters.vfc.exceptions.ApplicationException; -import org.onap.so.adapters.vfc.model.*; -import org.onap.so.adapters.vfc.util.JsonUtil; -import org.onap.so.adapters.vfc.util.RestfulUtil; -import org.onap.so.adapters.vfc.util.ValidateUtil; -import org.onap.so.db.request.beans.InstanceNfvoMapping; -import org.onap.so.db.request.beans.OperationStatus; -import org.onap.so.db.request.beans.ResourceOperationStatus; -import org.onap.so.db.request.data.repository.InstanceNfvoMappingRepository; -import org.onap.so.db.request.data.repository.OperationStatusRepository; -import org.onap.so.db.request.data.repository.ResourceOperationStatusRepository; -import org.onap.so.requestsdb.RequestsDbConstant; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Primary; -import org.springframework.data.domain.Example; -import org.springframework.stereotype.Component; - -/** - * VF-C Manager <br> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-08-28 - */ -@Component -@Primary -public class VfcManagerSol005 { - - private static final Logger LOGGER = LoggerFactory.getLogger(VfcManagerSol005.class); - - /** - * nfvo url map - */ - private Map<String, String> nfvoUrlMap; - - @Autowired - private ResourceOperationStatusRepository resourceOperationStatusRepository; - - @Autowired - private RestfulUtil restfulUtil; - - @Autowired - private OperationStatusRepository operationStatusRepository; - - @Autowired - private InstanceNfvoMappingRepository instanceNfvoMappingRepository; - - private InstanceNfvoMapping instanceNfvoMapping = new InstanceNfvoMapping(); - - public VfcManagerSol005() { - nfvoUrlMap = new HashMap<>(); - nfvoUrlMap.put(Step.CREATE, CommonConstant.SOL005_NFVO_CREATE_URL); - nfvoUrlMap.put(Step.INSTANTIATE, CommonConstant.SOL005_NFVO_INSTANTIATE_URL); - nfvoUrlMap.put(Step.TERMINATE, CommonConstant.SOL005_NFVO_TERMINATE_URL); - nfvoUrlMap.put(Step.DELETE, CommonConstant.SOL005_NFVO_DELETE_URL); - nfvoUrlMap.put(Step.QUERY, CommonConstant.SOL005_NFVO_QUERY_URL); - nfvoUrlMap.put(Step.SCALE, CommonConstant.NFVO_SCALE_URL); - } - - /** - * create network service <br> - * - * @param segInput input parameters for current node from http request - * @return - * @since ONAP Dubilin Release - */ - public RestfulResponse createNs(NSResourceInputParameter segInput) throws ApplicationException { - - Map<String, String> nfvoDetails; - // Step1: get service template by node type - String nsdId = segInput.getNsServiceModelUUID(); - // nsdId for NFVO is "id" in the response, while for SDNO is "servcice template id" - LOGGER.info("serviceTemplateId is {}, id is {}", nsdId, nsdId); - - - LOGGER.info("SOL005 create ns -> begin"); - // Step2: Prepare url and method type - String url = getUrl(null, CommonConstant.Step.CREATE); - String methodType = CommonConstant.MethodType.POST; - - // Step3: Prepare restful parameters and options - CreateNsRequest createNsRequest = new CreateNsRequest(); - createNsRequest.setNsDescription(segInput.getNsServiceDescription()); - createNsRequest.setNsdId(segInput.getNsServiceModelUUID()); - createNsRequest.setNsName(segInput.getNsServiceName()); - - String createReq = JsonUtil.marshal(createNsRequest); - RestfulResponse aaiRestfulResponse = null; - NsParameters nsParameters = segInput.getNsParameters(); - if (nsParameters.getAdditionalParamForNs().containsKey("orchestrator")) { - if (nsParameters.getAdditionalParamForNs().get("orchestrator") != null) { - String nfvo = nsParameters.getAdditionalParamForNs().get("nfvo").toString(); - aaiRestfulResponse = restfulUtil.getNfvoFromAAI(nfvo); - nfvoDetails = JsonUtil.unMarshal(aaiRestfulResponse.getResponseContent(), Map.class); - url = nfvoDetails.get("url") + nfvoDetails.get("api-root") + url; - - } - } else { - LOGGER.error("Nfvo not present in AAI"); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_CREATE_NS); - } - - - // Prepare request header for createNs request. - Map<String, String> requestHeader = new HashMap<>(); - requestHeader.put("GLOBALCUSTOMERID", segInput.getNsOperationKey().getGlobalSubscriberId()); - requestHeader.put("SERVICETYPE", segInput.getNsOperationKey().getServiceType()); - - // Step4: Call NFVO or SDNO lcm to create ns - LOGGER.info("Request Payload for CreateNs: " + createReq); - - RestfulResponse createRsp = restfulUtil.send(url, methodType, createReq, requestHeader); - ValidateUtil.assertObjectNotNull(createRsp); - LOGGER.info("create ns response status is : {}", createRsp.getStatus()); - LOGGER.info("create ns response content is : {}", createRsp.getResponseContent()); - - // Step 5: save resource operation information - ResourceOperationStatus status = new ResourceOperationStatus(segInput.getNsOperationKey().getServiceId(), - segInput.getNsOperationKey().getOperationId(), segInput.getNsOperationKey().getNodeTemplateUUID()); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - status = resourceOperationStatusRepository.save(status); - if (!HttpCode.isSucess(createRsp.getStatus())) { - LOGGER.error("update segment operation status : fail to create ns"); - status.setProgress("40"); - status.setStatusDescription("NS not created"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(createRsp.getStatus())); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_CREATE_NS); - } - // TODO: Capture all the content of the response. Currently fetching ID value alone. - // Should be converted into the NsInstance.class - @SuppressWarnings("unchecked") - Map<String, String> rsp = JsonUtil.unMarshal(createRsp.getResponseContent(), Map.class); - String nsInstanceId = rsp.get(CommonConstant.SOL005_NS_INSTANCE_ID); - if (ValidateUtil.isStrEmpty(nsInstanceId)) { - LOGGER.error("Invalid instanceId from create operation"); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSEE_FROM_CREATE_OPERATION); - } - - nfvoDetails = JsonUtil.unMarshal(aaiRestfulResponse.getResponseContent(), Map.class); - instanceNfvoMapping.setInstanceId(nsInstanceId); - instanceNfvoMapping.setPassword(nfvoDetails.get("password")); - instanceNfvoMapping.setUsername(nfvoDetails.get("userName")); - instanceNfvoMapping.setNfvoName(nfvoDetails.get("nfvoId")); - instanceNfvoMapping.setEndpoint(nfvoDetails.get("url")); - instanceNfvoMapping.setApiRoot(nfvoDetails.get("api-root")); - instanceNfvoMappingRepository.save(instanceNfvoMapping); - LOGGER.info("create ns -> end"); - LOGGER.info("save segment and operaton info -> begin"); - // Step 6: add relation between service and NS - AaiUtil.addRelation(segInput.getNsOperationKey().getGlobalSubscriberId(), - segInput.getNsOperationKey().getServiceType(), segInput.getNsOperationKey().getServiceId(), - nsInstanceId); - LOGGER.info("save segment and operation info -> end"); - return createRsp; - } - - /** - * delete network service <br> - * - * @param nsOperationKey The operation key of the NS resource - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Dublin Release - */ - public RestfulResponse deleteNs(NsOperationKey nsOperationKey, String nsInstanceId) throws ApplicationException { - LOGGER.info("SOL005 delete ns -> begin"); - // Step1: prepare url and methodType - String url = getUrl(nsInstanceId, CommonConstant.Step.DELETE); - String methodType = CommonConstant.MethodType.DELETE; - - // Step2: prepare restful parameters and options - RestfulResponse deleteRsp = restfulUtil.send(url, methodType, ""); - ValidateUtil.assertObjectNotNull(deleteRsp); - LOGGER.info("delete ns response status is : {}", deleteRsp.getStatus()); - LOGGER.info("delete ns response content is : {}", deleteRsp.getResponseContent()); - LOGGER.info("delete ns -> end"); - - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - if (!HttpCode.isSucess(deleteRsp.getStatus())) { - LOGGER.error("fail to delete ns"); - - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(deleteRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_DELETE_NS); - } - - // Step3: remove relation info between service and ns - AaiUtil.removeRelation(nsOperationKey.getGlobalSubscriberId(), nsOperationKey.getServiceType(), - nsOperationKey.getServiceId(), nsInstanceId); - LOGGER.info("delete segment information -> end"); - - // Step4: update service segment operation status - status.setStatus(RequestsDbConstant.Status.FINISHED); - status.setErrorCode(String.valueOf(deleteRsp.getStatus())); - status.setProgress("100"); - status.setStatusDescription("VFC resource deletion finished"); - resourceOperationStatusRepository.save(status); - LOGGER.info("update segment operaton status for delete -> end"); - - return deleteRsp; - - } - - /** - * instantiate network service <br> - * - * @param nsInstanceId The NS instance id - * @param segInput input parameters for current node from http request - * @return - * @since ONAP Dublin Release - */ - public RestfulResponse instantiateNs(String nsInstanceId, NSResourceInputParameter segInput) - throws ApplicationException { - // Call the NFVO or SDNO service to instantiate service - LOGGER.info("SOL005 instantiate ns -> begin"); - - // Step1: Prepare restful parameters and options - InstantiateNsRequest instantiateNsRequest = new InstantiateNsRequest(); - - NsInstantiateReq oRequest = new NsInstantiateReq(); - oRequest.setNsInstanceId(nsInstanceId); - NsParameters nsParameters = segInput.getNsParameters(); - - ArrayList<VnfLocationConstraint> vnfLocationConstraints = new ArrayList<VnfLocationConstraint>(); - for (LocationConstraint locationConstraint : nsParameters.getLocationConstraints()) { - VnfLocationConstraint vnfLocationConstraint = new VnfLocationConstraint(); - vnfLocationConstraint.setVnfProfileId(locationConstraint.getVnfProfileId()); - vnfLocationConstraint.setLocationConstraints(null); - vnfLocationConstraints.add(vnfLocationConstraint); - - } - instantiateNsRequest.setAditionalParamsForNs(nsParameters.getAdditionalParamForNs()); - // Setting FlavourID which is a mandatory paramater to default - // as UUI is not sending this parameter to so - instantiateNsRequest.setNsFlavourId("default"); - String instReq = JsonUtil.marshal(instantiateNsRequest); - LOGGER.info("Request Payload for InstantiateNs: " + instReq); - // Step2: prepare url and - String url = getUrl(nsInstanceId, CommonConstant.Step.INSTANTIATE); - String methodType = CommonConstant.MethodType.POST; - instanceNfvoMapping = instanceNfvoMappingRepository.findOneByInstanceId(nsInstanceId); - - if (instanceNfvoMapping != null) { - - url = instanceNfvoMapping.getEndpoint() + instanceNfvoMapping.getApiRoot() + url; - - } else { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - - } - // Step3: prepare restful parameters and options - Map<String, String> reqBody = new HashMap<>(); - reqBody.put("terminationTime", LocalDateTime.now().toString()); - RestfulResponse instRsp = restfulUtil.send(url, methodType, instReq); - ResourceOperationStatus status = new ResourceOperationStatus(segInput.getNsOperationKey().getServiceId(), - segInput.getNsOperationKey().getOperationId(), segInput.getNsOperationKey().getNodeTemplateUUID()); - ValidateUtil.assertObjectNotNull(instRsp); - if (!HttpCode.isSucess(instRsp.getStatus())) { - LOGGER.error("update segment operation status : fail to instantiate ns"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(instRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } - LOGGER.info("instantiate ns response status is : {}", instRsp.getStatus()); - LOGGER.info("response payload is {}", instRsp.getResponseContent()); - String jobId = null; - if (instRsp.getStatus() == 202) { - String jobUri = instRsp.getRespHeaderStr(CommonConstant.JOB_URI); - LOGGER.info("JOB URI" + jobUri); - jobId = jobUri.split("/")[4]; - if (ValidateUtil.isStrEmpty(jobId)) { - LOGGER.error("Invalid jobId from instantiate operation"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(instRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSE_FROM_INSTANTIATE_OPERATION); - } - - } else if (instRsp.getStatus() > 400 && instRsp.getStatus() < 600) { - LOGGER.error("ERROR while executing instantiateNs request"); - ProblemDetails problemDetails = JsonUtil.unMarshal(instRsp.getResponseContent(), ProblemDetails.class); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(instRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED + problemDetails.getDetail()); - resourceOperationStatusRepository.save(status); - if (instRsp.getStatus() == 406) { - throw new ApplicationException(HttpCode.NOT_ACCEPTABLE, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } else if (instRsp.getStatus() == 400) { - throw new ApplicationException(HttpCode.BAD_REQUEST, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } else if (instRsp.getStatus() == 404) { - throw new ApplicationException(HttpCode.NOT_FOUND, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } else if (instRsp.getStatus() == 409) { - LOGGER.error("The operation cannot be executed currently,\n" - + "due to a conflict with the state of the resource"); - throw new ApplicationException(HttpCode.RESPOND_CONFLICT, DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } else if (instRsp.getStatus() == 500) { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } else { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.FAIL_TO_INSTANTIATE_NS); - } - - } - LOGGER.info("Job id is " + jobId); - LOGGER.info("Nfvo Details" + instanceNfvoMapping.toString()); - LOGGER.info("instantiate ns -> end"); - // Step 3: update segment operation job id - LOGGER.info("update resource operation status job id -> begin"); - status.setJobId(jobId); - status.setProgress("100"); - status.setStatusDescription("NS initiation completed."); - resourceOperationStatusRepository.save(status); - instanceNfvoMapping.setJobId(jobId); - instanceNfvoMappingRepository.save(instanceNfvoMapping); - LOGGER.info("update segment operation job id -> end" + instanceNfvoMapping.toString()); - return instRsp; - } - - /** - * terminate network service <br> - * - * @param nsOperationKey The operation key for NS resource - * @param nsInstanceId The NS instance id - * @return - * @since ONAP Dublin Release - */ - public RestfulResponse terminateNs(NsOperationKey nsOperationKey, String nsInstanceId) throws ApplicationException { - // Step1: save segment operation info for delete process - LOGGER.info("save segment operation for delete process"); - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - resourceOperationStatusRepository.save(status); - - LOGGER.info("SOL005 terminate ns -> begin"); - // Step2: prepare url and method type - String url = getUrl(nsInstanceId, CommonConstant.Step.TERMINATE); - String methodType = CommonConstant.MethodType.POST; - - instanceNfvoMapping = instanceNfvoMappingRepository.findOneByInstanceId(nsInstanceId); - - if (instanceNfvoMapping != null) { - - url = instanceNfvoMapping.getEndpoint() + instanceNfvoMapping.getApiRoot() + url; - - } else { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } - // Step3: prepare restful parameters and options - Map<String, String> reqBody = new HashMap<>(); - reqBody.put("terminationTime", LocalDateTime.now().toString()); - - // Step4: Call the NFVO or SDNO service to terminate service - LOGGER.info("request body for terminate NS" + JsonUtil.marshal(reqBody)); - RestfulResponse terminateRsp = restfulUtil.send(url, methodType, JsonUtil.marshal(reqBody)); - ValidateUtil.assertObjectNotNull(terminateRsp); - LOGGER.info("terminate ns response status is : {}", terminateRsp.getStatus()); - LOGGER.info("terminate ns response content is : {}", terminateRsp.getResponseContent()); - // Step 3: update segment operation - if (!HttpCode.isSucess(terminateRsp.getStatus())) { - LOGGER.error("fail to terminate ns"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(terminateRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } - // @SuppressWarnings("unchecked") - String jobId = null; - Map<String, String> rsp = new HashMap<>(); - if (terminateRsp.getStatus() == 202) { - String jobUri = terminateRsp.getRespHeaderStr(CommonConstant.JOB_URI); - jobId = jobUri.split("/")[4]; - jobId.split("/"); - if (ValidateUtil.isStrEmpty(jobId)) { - LOGGER.error("Invalid jobId from instantiate operation"); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(terminateRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, - DriverExceptionID.INVALID_RESPONSE_FROM_INSTANTIATE_OPERATION); - } - rsp.put(CommonConstant.JOB_ID, jobId); - LOGGER.info("terminate ns -> end"); - LOGGER.info("update segment job id -> begin"); - status.setProgress("60"); - status.setStatusDescription("NS is termination completed"); - status.setJobId(jobId); - resourceOperationStatusRepository.save(status); - LOGGER.info("update segment job id -> end"); - } else if (terminateRsp.getStatus() > 400 && terminateRsp.getStatus() < 600) { - LOGGER.error("ERROR while executing instantiateNs request"); - ProblemDetails problemDetails = JsonUtil.unMarshal(terminateRsp.getResponseContent(), ProblemDetails.class); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setErrorCode(String.valueOf(terminateRsp.getStatus())); - status.setStatusDescription(CommonConstant.StatusDesc.TERMINATE_NS_FAILED + problemDetails.getDetail()); - resourceOperationStatusRepository.save(status); - if (terminateRsp.getStatus() == 406) { - throw new ApplicationException(HttpCode.NOT_ACCEPTABLE, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } else if (terminateRsp.getStatus() == 400) { - throw new ApplicationException(HttpCode.BAD_REQUEST, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } else if (terminateRsp.getStatus() == 404) { - throw new ApplicationException(HttpCode.NOT_FOUND, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } else if (terminateRsp.getStatus() == 409) { - LOGGER.error("The operation cannot be executed currently,\n" - + "due to a conflict with the state of the resource"); - throw new ApplicationException(HttpCode.RESPOND_CONFLICT, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } else if (terminateRsp.getStatus() == 500) { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } else { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_TERMINATE_NS); - } - - } - instanceNfvoMapping.setJobId(jobId); - instanceNfvoMappingRepository.save(instanceNfvoMapping); - terminateRsp.setResponseContent(rsp.toString()); - return terminateRsp; - } - - /** - * get ns progress by job Id <br> - * - * @param nsOperationKey The OperationKey for NS resource - * @param jobId the job id - * @return - * @since ONAP Dublin Release - */ - public RestfulResponse getNsProgress(NsOperationKey nsOperationKey, String jobId) throws ApplicationException { - - ValidateUtil.assertObjectNotNull(jobId); - // Step 1: query the current resource operation status - ResourceOperationStatus status = new ResourceOperationStatus(nsOperationKey.getServiceId(), - nsOperationKey.getOperationId(), nsOperationKey.getNodeTemplateUUID()); - // status = resourceOperationStatusRepository.findOne(Example.of(status)) - // .orElseThrow(() -> new ApplicationException(404, "Cannot Find Operation Status")); - - // Get NFVO details - instanceNfvoMapping = instanceNfvoMappingRepository.findOneByJobId(jobId); - - // Step 2: start query - LOGGER.info("SOL005 query ns status -> begin"); - String url = getUrl(jobId, CommonConstant.Step.QUERY); - String methodType = CommonConstant.MethodType.GET; - if (instanceNfvoMapping != null) { - - url = instanceNfvoMapping.getEndpoint() + instanceNfvoMapping.getApiRoot() + url; - - } else { - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_QUERY_JOB_STATUS); - } - - // prepare restful parameters and options - RestfulResponse rsp = restfulUtil.send(url, methodType, ""); - ValidateUtil.assertObjectNotNull(rsp); - LOGGER.info("query ns progress response status is : {}", rsp.getStatus()); - LOGGER.info("query ns progress response content is : {}", rsp.getResponseContent()); - // Step 3:check the response staus - if (!HttpCode.isSucess(rsp.getStatus())) { - LOGGER.info("fail to query job status"); - ProblemDetails problemDetails = JsonUtil.unMarshal(rsp.getResponseContent(), ProblemDetails.class); - status.setErrorCode(String.valueOf(rsp.getStatus())); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setStatusDescription(CommonConstant.StatusDesc.QUERY_JOB_STATUS_FAILED + problemDetails.getDetail()); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_QUERY_JOB_STATUS); - } - // Step 4: Process Network Service Instantiate Response - NsLcmOpOcc nsProgress = JsonUtil.unMarshal(rsp.getResponseContent(), NsLcmOpOcc.class); - if (CommonConstant.operationState.FAILED.equals(nsProgress.getOperationState())) { - LOGGER.info("NS instantiate fails"); - status.setErrorCode(String.valueOf(rsp.getStatus())); - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setStatusDescription( - CommonConstant.StatusDesc.INSTANTIATE_NS_FAILED + nsProgress.getError().getDetail()); - resourceOperationStatusRepository.save(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.FAIL_TO_QUERY_JOB_STATUS); - } - // Step 5: update segment operation progress - - if (nsProgress.getOperationState().equals(CommonConstant.operationState.PROCESSING)) { - status.setProgress("40"); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - status.setStatusDescription("NS operation is in progress"); - resourceOperationStatusRepository.save(status); - updateOperationStatusBasedOnResourceStatus(status); - } else if (nsProgress.getOperationState().equals(CommonConstant.operationState.PARTIALLY_COMPLETED)) { - status.setProgress("60"); - status.setStatus(RequestsDbConstant.Status.PROCESSING); - status.setStatusDescription("NS operation is partially completed"); - resourceOperationStatusRepository.save(status); - } else if (nsProgress.getOperationState().equals(CommonConstant.operationState.COMPLETED)) { - status.setStatus(RequestsDbConstant.Status.FINISHED); - status.setProgress("100"); - status.setStatusDescription("NS operation is Completed"); - resourceOperationStatusRepository.save(status); - updateOperationStatusBasedOnResourceStatus(status); - - } else if (nsProgress.getOperationState().equals(CommonConstant.operationState.FAILED) - || nsProgress.getOperationState().equals(CommonConstant.operationState.FAILED_TEMP)) { - status.setStatus(RequestsDbConstant.Status.ERROR); - status.setProgress("0"); - status.setStatusDescription("NS operation Failed"); - resourceOperationStatusRepository.save(status); - updateOperationStatusBasedOnResourceStatus(status); - throw new ApplicationException(HttpCode.INTERNAL_SERVER_ERROR, DriverExceptionID.JOB_STATUS_ERROR); - } else { - LOGGER.error("unexcepted response status"); - - } - return rsp; - } - - /** - * get url for the operation <br> - * - * @param variable variable should be put in the url - * @param step step of the operation (terminate,query,delete) - * @return - * @since ONAP Dublin Release - */ - private String getUrl(String variable, String step) { - - String url; - String originalUrl; - originalUrl = nfvoUrlMap.get(step); - url = String.format(originalUrl, variable); - return url; - - } - - private void updateOperationStatusBasedOnResourceStatus(ResourceOperationStatus operStatus) { - String serviceId = operStatus.getServiceId(); - String operationId = operStatus.getOperationId(); - - LOGGER.debug("Request database - update Operation Status Based On Resource Operation Status with service Id: " - + "{}, operationId: {}", serviceId, operationId); - - List<ResourceOperationStatus> lstResourceStatus = - resourceOperationStatusRepository.findByServiceIdAndOperationId(serviceId, operationId); - if (lstResourceStatus == null) { - LOGGER.error("Unable to retrieve resourceOperStatus Object by ServiceId: {} operationId: {}", serviceId, - operationId); - return; - } - - // count the total progress - int resourceCount = lstResourceStatus.size(); - int progress = 0; - boolean isFinished = true; - for (ResourceOperationStatus lstResourceStatu : lstResourceStatus) { - progress = progress + Integer.valueOf(lstResourceStatu.getProgress()) / resourceCount; - if (RequestsDbConstant.Status.PROCESSING.equals(lstResourceStatu.getStatus())) { - isFinished = false; - } - } - - OperationStatus serviceOperStatus = - operationStatusRepository.findOneByServiceIdAndOperationId(serviceId, operationId); - if (serviceOperStatus == null) { - String error = "Entity not found. Unable to retrieve OperationStatus Object ServiceId: " + serviceId - + " operationId: " + operationId; - LOGGER.error(error); - - serviceOperStatus = new OperationStatus(); - serviceOperStatus.setOperationId(operationId); - serviceOperStatus.setServiceId(serviceId); - } - - progress = progress > 100 ? 100 : progress; - serviceOperStatus.setProgress(String.valueOf(progress)); - serviceOperStatus.setOperationContent(operStatus.getStatusDescription()); - // if current resource failed. service failed. - if (RequestsDbConstant.Status.ERROR.equals(operStatus.getStatus())) { - serviceOperStatus.setResult(RequestsDbConstant.Status.ERROR); - serviceOperStatus.setReason(operStatus.getStatusDescription()); - } else if (isFinished) { - // if finished - serviceOperStatus.setResult(RequestsDbConstant.Status.FINISHED); - serviceOperStatus.setProgress(RequestsDbConstant.Progress.ONE_HUNDRED); - } - - operationStatusRepository.save(serviceOperStatus); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java deleted file mode 100644 index 04109bd89d..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/JsonUtil.java +++ /dev/null @@ -1,137 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2018 IBM. - * Modifications Copyright (c) 2019 Samsung - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.util; - -import java.io.IOException; -import org.onap.so.logger.LoggingAnchor; -import org.onap.so.adapters.vfc.constant.HttpCode; -import org.onap.so.adapters.vfc.exceptions.ApplicationException; -import org.onap.logging.filter.base.ErrorCode; -import org.onap.so.logger.MessageEnum; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Interface for json analyzing.<br/> - * <p> - * </p> - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -public class JsonUtil { - - /** - * Log service - */ - private static final Logger logger = LoggerFactory.getLogger(JsonUtil.class); - - /** - * Mapper. - */ - private static final ObjectMapper MAPPER = new ObjectMapper(); - private static final String UNMARSHAL_FAIL_MSG = "fail to unMarshal json"; - static { - MAPPER.setConfig(MAPPER.getDeserializationConfig().without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)); - MAPPER.setSerializationInclusion(Include.NON_NULL); - } - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since ONAP Amsterdam Release 2017-9-6 - */ - private JsonUtil() { - - } - - /** - * Parse the string in form of json.<br/> - * - * @param jsonstr json string. - * @param type that convert json string to - * @return model object - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static <T> T unMarshal(String jsonstr, Class<T> type) throws ApplicationException { - try { - return MAPPER.readValue(jsonstr, type); - } catch (IOException e) { - logger.error(LoggingAnchor.THREE, MessageEnum.RA_NS_EXC.toString(), - ErrorCode.BusinessProcessError.getValue(), UNMARSHAL_FAIL_MSG, e); - throw new ApplicationException(HttpCode.BAD_REQUEST, UNMARSHAL_FAIL_MSG); - } - } - - /** - * Parse the string in form of json.<br/> - * - * @param jsonstr json string. - * @param type that convert json string to - * @return model object - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static <T> T unMarshal(String jsonstr, TypeReference<T> type) throws ApplicationException { - try { - return MAPPER.readValue(jsonstr, type); - } catch (IOException e) { - logger.error(LoggingAnchor.THREE, MessageEnum.RA_NS_EXC.toString(), - ErrorCode.BusinessProcessError.getValue(), UNMARSHAL_FAIL_MSG, e); - throw new ApplicationException(HttpCode.BAD_REQUEST, UNMARSHAL_FAIL_MSG); - } - } - - /** - * Convert object to json string.<br/> - * - * @param srcObj data object - * @return json string - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static String marshal(Object srcObj) throws ApplicationException { - try { - return MAPPER.writeValueAsString(srcObj); - } catch (IOException e) { - logger.error(LoggingAnchor.THREE, MessageEnum.RA_NS_EXC.toString(), - ErrorCode.BusinessProcessError.getValue(), "fail to marshal json", e); - throw new ApplicationException(HttpCode.BAD_REQUEST, "srcObj marshal failed!"); - } - } - - /** - * Get mapper.<br/> - * - * @return mapper - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static ObjectMapper getMapper() { - return MAPPER; - } -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java deleted file mode 100644 index 54a2a98a00..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/RestfulUtil.java +++ /dev/null @@ -1,393 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2018. - * Modifications Copyright (c) 2019 Samsung - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.util; - -import java.net.HttpURLConnection; -import java.net.SocketTimeoutException; -import java.util.Base64; -import java.util.HashMap; -import java.util.Map; -import javax.ws.rs.core.UriBuilder; -import org.onap.so.logger.LoggingAnchor; -import org.apache.http.Header; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.methods.HttpDelete; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.client.methods.HttpRequestBase; -import org.apache.http.conn.ConnectTimeoutException; -import org.apache.http.entity.ContentType; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClientBuilder; -import org.apache.http.util.EntityUtils; -import org.onap.so.adapters.vfc.model.RestfulResponse; -import org.onap.logging.filter.base.ErrorCode; -import org.onap.so.logger.MessageEnum; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.env.Environment; -import org.springframework.stereotype.Component; - -/** - * <br> - * <p> - * </p> - * utility to invoke restclient - * - * @author - * @version ONAP Amsterdam Release 2017-9-6 - */ -@Component -public class RestfulUtil { - - /** - * Log service - */ - private static final Logger logger = LoggerFactory.getLogger(RestfulUtil.class); - - private static final int DEFAULT_TIME_OUT = 60000; - - private static final String ONAP_IP = "ONAP_IP"; - - private static final String DEFAULT_MSB_IP = "127.0.0.1"; - - private static final Integer DEFAULT_MSB_PORT = 80; - - private static final String VFC_ADAPTER = "VFC Adapter"; - - @Autowired - private Environment env; - - @Autowired - private HttpClient client; - - public String getMsbHost() { - // MSB_IP will be set as ONAP_IP environment parameter in install flow. - String msbIp = System.getenv().get(ONAP_IP); - // if ONAP IP is not set. get it from config file. - if (null == msbIp || msbIp.isEmpty()) { - msbIp = env.getProperty("mso.msb-ip", DEFAULT_MSB_IP); - } - Integer msbPort = env.getProperty("mso.msb-port", Integer.class, DEFAULT_MSB_PORT); - - String msbEndpoint = UriBuilder.fromPath("").host(msbIp).port(msbPort).scheme("http").build().toString(); - logger.debug("msbEndpoint in vfc adapter: {}", msbEndpoint); - - return msbEndpoint; - } - - private RestfulUtil() { - - } - - - public RestfulResponse send(String msbUrl, String methodType, String content, Map<String, String> requestHeader) { - // String msbUrl = getMsbHost() + url; - logger.debug("Begin to sent message " + methodType + ": " + msbUrl); - - HttpRequestBase method = null; - HttpResponse httpResponse = null; - - try { - int timeout = DEFAULT_TIME_OUT; - - RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(timeout).setConnectTimeout(timeout) - .setConnectionRequestTimeout(timeout).build(); - - HttpClient client = HttpClientBuilder.create().build(); - - if ("POST".equalsIgnoreCase(methodType)) { - HttpPost httpPost = new HttpPost(msbUrl); - httpPost.setConfig(requestConfig); - for (String key : requestHeader.keySet()) { - httpPost.setHeader(key, requestHeader.get(key)); - } - httpPost.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON)); - method = httpPost; - } else if ("PUT".equalsIgnoreCase(methodType)) { - HttpPut httpPut = new HttpPut(msbUrl); - httpPut.setConfig(requestConfig); - httpPut.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON)); - method = httpPut; - } else if ("GET".equalsIgnoreCase(methodType)) { - HttpGet httpGet = new HttpGet(msbUrl); - httpGet.setConfig(requestConfig); - method = httpGet; - } else if ("DELETE".equalsIgnoreCase(methodType)) { - HttpDelete httpDelete = new HttpDelete(msbUrl); - httpDelete.setConfig(requestConfig); - method = httpDelete; - } - - // now VFC have no auth - // String userCredentials = - // SDNCAdapterProperties.getEncryptedProperty(Constants.SDNC_AUTH_PROP, - // Constants.DEFAULT_SDNC_AUTH, Constants.ENCRYPTION_KEY); - // String authorization = "Basic " + - // DatatypeConverter.printBase64Binary(userCredentials.getBytes()); - // method.setHeader("Authorization", authorization); - - httpResponse = client.execute(method); - Map<String, String> responseHeader = new HashMap<>(); - String responseContent = null; - if (httpResponse.getEntity() != null) { - responseContent = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); - Header[] httpResponseAllHeaders = httpResponse.getAllHeaders(); - for (Header header : httpResponseAllHeaders) { - responseHeader.put(header.getName(), header.getValue()); - - } - } - - int statusCode = httpResponse.getStatusLine().getStatusCode(); - String statusMessage = httpResponse.getStatusLine().getReasonPhrase(); - - logger.debug("VFC Response: {} {}", statusCode, - statusMessage + (responseContent == null ? "" : System.lineSeparator() + responseContent)); - - if (httpResponse.getStatusLine().getStatusCode() >= 300) { - String errMsg = "VFC returned " + statusCode + " " + statusMessage; - logError(errMsg); - return createResponse(statusCode, errMsg); - } - - httpResponse = null; - - if (null != method) { - method.reset(); - } else { - logger.debug("method is NULL:"); - } - - method = null; - return createResponse(statusCode, responseContent, responseHeader); - - } catch (SocketTimeoutException | ConnectTimeoutException e) { - String errMsg = "Request to VFC timed out"; - logError(errMsg, e); - return createResponse(HttpURLConnection.HTTP_CLIENT_TIMEOUT, errMsg); - - } catch (Exception e) { - String errMsg = "Error processing request to VFC"; - logError(errMsg, e); - return createResponse(HttpURLConnection.HTTP_INTERNAL_ERROR, errMsg); - - } finally { - if (httpResponse != null) { - try { - EntityUtils.consume(httpResponse.getEntity()); - } catch (Exception e) { - logger.debug("Exception :", e); - } - } - - if (method != null) { - try { - method.reset(); - } catch (Exception e) { - logger.debug("Exception :", e); - } - } - } - } - - public RestfulResponse send(String msbUrl, String methodType, String content) { - if (!msbUrl.contains("http")) { - msbUrl = getMsbHost() + msbUrl; - } - // String msbUrl = getMsbHost() + url; - logger.debug("Begin to sent message " + methodType + ": " + msbUrl); - - HttpRequestBase method = null; - HttpResponse httpResponse = null; - - try { - int timeout = DEFAULT_TIME_OUT; - - RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(timeout).setConnectTimeout(timeout) - .setConnectionRequestTimeout(timeout).build(); - - if ("POST".equalsIgnoreCase(methodType)) { - HttpPost httpPost = new HttpPost(msbUrl); - httpPost.setConfig(requestConfig); - httpPost.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON)); - method = httpPost; - } else if ("PUT".equalsIgnoreCase(methodType)) { - HttpPut httpPut = new HttpPut(msbUrl); - httpPut.setConfig(requestConfig); - httpPut.setEntity(new StringEntity(content, ContentType.APPLICATION_JSON)); - method = httpPut; - } else if ("GET".equalsIgnoreCase(methodType)) { - HttpGet httpGet = new HttpGet(msbUrl); - httpGet.setConfig(requestConfig); - method = httpGet; - } else if ("DELETE".equalsIgnoreCase(methodType)) { - HttpDelete httpDelete = new HttpDelete(msbUrl); - httpDelete.setConfig(requestConfig); - method = httpDelete; - } - - // now VFC have no auth - // String userCredentials = - // SDNCAdapterProperties.getEncryptedProperty(Constants.SDNC_AUTH_PROP, - // Constants.DEFAULT_SDNC_AUTH, Constants.ENCRYPTION_KEY); - // String authorization = "Basic " + - // DatatypeConverter.printBase64Binary(userCredentials.getBytes()); - // method.setHeader("Authorization", authorization); - - httpResponse = client.execute(method); - Map<String, String> responseHeader = new HashMap<>(); - String responseContent = null; - if (httpResponse.getEntity() != null) { - responseContent = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); - Header[] httpResponseAllHeaders = httpResponse.getAllHeaders(); - for (Header header : httpResponseAllHeaders) { - responseHeader.put(header.getName(), header.getValue()); - - } - } - - int statusCode = httpResponse.getStatusLine().getStatusCode(); - String statusMessage = httpResponse.getStatusLine().getReasonPhrase(); - - logger.debug("VFC Response: " + statusCode + " " + statusMessage - + (responseContent == null ? "" : System.lineSeparator() + responseContent)); - - if (httpResponse.getStatusLine().getStatusCode() >= 300) { - String errMsg = "VFC returned " + statusCode + " " + statusMessage; - logError(errMsg); - return createResponse(statusCode, errMsg); - } - - httpResponse = null; - - if (null != method) { - method.reset(); - } else { - logger.debug("method is NULL:"); - } - - method = null; - return createResponse(statusCode, responseContent, responseHeader); - - } catch (SocketTimeoutException | ConnectTimeoutException e) { - String errMsg = "Request to VFC timed out"; - logError(errMsg, e); - return createResponse(HttpURLConnection.HTTP_CLIENT_TIMEOUT, errMsg); - - } catch (Exception e) { - String errMsg = "Error processing request to VFC"; - logError(errMsg, e); - return createResponse(HttpURLConnection.HTTP_INTERNAL_ERROR, errMsg); - - } finally { - if (httpResponse != null) { - try { - EntityUtils.consume(httpResponse.getEntity()); - } catch (Exception e) { - logger.debug("Exception :", e); - } - } - - if (method != null) { - try { - method.reset(); - } catch (Exception e) { - logger.debug("Exception :", e); - } - } - } - } - - public RestfulResponse getNfvoFromAAI(String nfvo) { - HttpRequestBase method = null; - HttpResponse httpResponse = null; - String endPoint = getMsbHost() + "/api/aai-esr-server/v1/nfvos/" + nfvo; - logger.info("Endpoint URL" + endPoint); - RequestConfig requestConfig = RequestConfig.custom().setSocketTimeout(DEFAULT_TIME_OUT) - .setConnectTimeout(DEFAULT_TIME_OUT).setConnectionRequestTimeout(DEFAULT_TIME_OUT).build(); - HttpClient client = HttpClientBuilder.create().build(); - HttpGet httpGet = new HttpGet(endPoint); - httpGet.setConfig(requestConfig); - String encoding = Base64.getEncoder().encodeToString(("AAI:AAI").getBytes()); - httpGet.setHeader("Authorization", "Basic " + encoding); - method = httpGet; - String responseContent = null; - Map<String, String> responseHeader = null; - try { - httpResponse = client.execute(method); - if (httpResponse.getEntity() != null) { - responseContent = EntityUtils.toString(httpResponse.getEntity(), "UTF-8"); - } - - int statusCode = httpResponse.getStatusLine().getStatusCode(); - String statusMessage = httpResponse.getStatusLine().getReasonPhrase(); - - logger.debug("AAI Response: " + statusCode + " " + statusMessage - + (responseContent == null ? "" : System.lineSeparator() + responseContent)); - - if (httpResponse.getStatusLine().getStatusCode() >= 300) { - String errMsg = "AAI returned " + statusCode + " " + statusMessage; - logError(errMsg); - return createResponse(statusCode, errMsg); - } - } catch (Exception e) { - String errMsg = "Error processing request to AAI"; - logError(errMsg, e); - return createResponse(HttpURLConnection.HTTP_INTERNAL_ERROR, errMsg); - } - return createResponse(200, responseContent); - } - - private static void logError(String errMsg, Throwable t) { - logger.error(LoggingAnchor.FOUR, MessageEnum.RA_NS_EXC.toString(), VFC_ADAPTER, - ErrorCode.AvailabilityError.getValue(), errMsg, t); - } - - private static void logError(String errMsg) { - logger.error(LoggingAnchor.FOUR, MessageEnum.RA_NS_EXC.toString(), VFC_ADAPTER, - ErrorCode.AvailabilityError.toString(), errMsg); - } - - private static RestfulResponse createResponse(int statusCode, String content) { - RestfulResponse rsp = new RestfulResponse(); - rsp.setStatus(statusCode); - rsp.setResponseContent(content); - return rsp; - } - - private static RestfulResponse createResponse(int statusCode, String content, Map<String, String> responseHeader) { - RestfulResponse rsp = new RestfulResponse(); - rsp.setStatus(statusCode); - rsp.setRespHeaderMap(responseHeader); - rsp.setResponseContent(content); - return rsp; - } - -} diff --git a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java deleted file mode 100644 index f56f5af05b..0000000000 --- a/adapters/mso-vfc-adapter/src/main/java/org/onap/so/adapters/vfc/util/ValidateUtil.java +++ /dev/null @@ -1,86 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * ONAP - SO - * ================================================================================ - * Copyright (C) 2017 Huawei Technologies Co., Ltd. All rights reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.so.adapters.vfc.util; - -import org.onap.so.adapters.vfc.constant.HttpCode; -import org.onap.so.adapters.vfc.exceptions.ApplicationException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class ValidateUtil { - - /** - * Log server. - */ - private static final Logger LOGGER = LoggerFactory.getLogger(ValidateUtil.class); - - /** - * Constructor<br/> - * <p> - * </p> - * - * @since ONAP Amsterdam Release 2017-9-6 - */ - private ValidateUtil() { - - } - - /** - * Assert String parameter.<br/> - * - * @param paramValue parameter data - * @param paramName parameter name - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static void assertStringNotNull(String paramValue, String paramName) throws ApplicationException { - if (null != paramValue && !paramValue.isEmpty()) { - return; - } - - LOGGER.error(paramName + ": Parameter is null or empty."); - throw new ApplicationException(HttpCode.BAD_REQUEST, paramName + ": Invalid parameter."); - } - - /** - * Assert object is null.<br/> - * - * @param object data object - * @since ONAP Amsterdam Release 2017-9-6 - */ - public static void assertObjectNotNull(Object object) throws ApplicationException { - if (null == object) { - LOGGER.error("Object is null."); - throw new ApplicationException(HttpCode.BAD_REQUEST, "Object is null."); - } - - } - - /** - * <br> - * - * @param str - * @return - * @since ONAP Amsterdam Release - */ - public static boolean isStrEmpty(String str) { - return null == str || str.isEmpty(); - } -} diff --git a/adapters/mso-vfc-adapter/src/main/resources/application-aaf.yaml b/adapters/mso-vfc-adapter/src/main/resources/application-aaf.yaml deleted file mode 100644 index e69de29bb2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/resources/application-aaf.yaml +++ /dev/null diff --git a/adapters/mso-vfc-adapter/src/main/resources/application-basic.yaml b/adapters/mso-vfc-adapter/src/main/resources/application-basic.yaml deleted file mode 100644 index e69de29bb2..0000000000 --- a/adapters/mso-vfc-adapter/src/main/resources/application-basic.yaml +++ /dev/null diff --git a/adapters/mso-vfc-adapter/src/main/resources/application.yaml b/adapters/mso-vfc-adapter/src/main/resources/application.yaml deleted file mode 100644 index 4a500b3a50..0000000000 --- a/adapters/mso-vfc-adapter/src/main/resources/application.yaml +++ /dev/null @@ -1,37 +0,0 @@ - -server: - port: 8080 - tomcat: - max-threads: 50 - -mso: - site-name: unknown - logPath: ./logs/vfc/ - -spring: - datasource: - jdbc-url: jdbc:mariadb://${DB_HOST}:${DB_PORT}/requestdb - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - driver-class-name: org.mariadb.jdbc.Driver - jpa: - show-sql: false - hibernate: - dialect: org.hibernate.dialect.MySQL5Dialect - ddl-auto: validate - naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy - enable-lazy-load-no-trans: true - -#Actuator -management: - endpoints: - web: - base-path: /manage - exposure: - include: "*" - metrics: - se-global-registry: false - export: - prometheus: - enabled: true # Whether exporting of metrics to Prometheus is enabled. - step: 1m # Step size (i.e. reporting frequency) to use.
\ No newline at end of file |