diff options
author | Seshu Kumar M <seshu.kumar.m@huawei.com> | 2017-09-19 10:39:18 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2017-09-19 10:39:18 +0000 |
commit | c7e6f2b9ab81bc1ca6721d68a8f5369dedfefb28 (patch) | |
tree | 2cd489ae2b8711b150a518a2a442ecd0c5862c0a | |
parent | 10ab1b1efa58f4a5a28a068aec6e7bdad0da8937 (diff) | |
parent | 03959df4ccf2ff5ab9d70aa4a5ba3975d37fb903 (diff) |
Merge "delete unwanted code IssueId:SO-118"
8 files changed, 0 insertions, 644 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EAdditionalParamForNs.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EAdditionalParamForNs.java deleted file mode 100644 index f6a281df99..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EAdditionalParamForNs.java +++ /dev/null @@ -1,136 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2EAdditionalParamForNs { - - @JsonProperty("externalDataNetworkName") - private String externalDataNetworkName; - @JsonProperty("m6000_mng_ip") - private String m6000MngIp; - @JsonProperty("externalCompanyFtpDataNetworkName") - private String externalCompanyFtpDataNetworkName; - @JsonProperty("externalPluginManageNetworkName") - private String externalPluginManageNetworkName; - @JsonProperty("externalManageNetworkName") - private String externalManageNetworkName; - @JsonProperty("sfc_data_network") - private String sfcDataNetwork; - @JsonProperty("NatIpRange") - private String natIpRange; - @JsonProperty("location") - private String location; - @JsonProperty("sdncontroller") - private String sdncontroller; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getExternalDataNetworkName() { - return externalDataNetworkName; - } - - public void setExternalDataNetworkName(String externalDataNetworkName) { - this.externalDataNetworkName = externalDataNetworkName; - } - - public String getM6000MngIp() { - return m6000MngIp; - } - - public void setM6000MngIp(String m6000MngIp) { - this.m6000MngIp = m6000MngIp; - } - - public String getExternalCompanyFtpDataNetworkName() { - return externalCompanyFtpDataNetworkName; - } - - public void setExternalCompanyFtpDataNetworkName( - String externalCompanyFtpDataNetworkName) { - this.externalCompanyFtpDataNetworkName = externalCompanyFtpDataNetworkName; - } - - public String getExternalPluginManageNetworkName() { - return externalPluginManageNetworkName; - } - - public void setExternalPluginManageNetworkName( - String externalPluginManageNetworkName) { - this.externalPluginManageNetworkName = externalPluginManageNetworkName; - } - - public String getExternalManageNetworkName() { - return externalManageNetworkName; - } - - public void setExternalManageNetworkName(String externalManageNetworkName) { - this.externalManageNetworkName = externalManageNetworkName; - } - - public String getSfcDataNetwork() { - return sfcDataNetwork; - } - - public void setSfcDataNetwork(String sfcDataNetwork) { - this.sfcDataNetwork = sfcDataNetwork; - } - - public String getNatIpRange() { - return natIpRange; - } - - public void setNatIpRange(String natIpRange) { - this.natIpRange = natIpRange; - } - - public String getLocation() { - return location; - } - - public void setLocation(String location) { - this.location = location; - } - - public String getSdncontroller() { - return sdncontroller; - } - - public void setSdncontroller(String sdncontroller) { - this.sdncontroller = sdncontroller; - } - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraint.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraint.java deleted file mode 100644 index badb43c956..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraint.java +++ /dev/null @@ -1,65 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2ELocationConstraint { - - @JsonProperty("vnfProfileId") - private String vnfProfileId; - @JsonProperty("locationConstraints") - private E2ELocationConstraints locationConstraints; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getVnfProfileId() { - return vnfProfileId; - } - - public void setVnfProfileId(String vnfProfileId) { - this.vnfProfileId = vnfProfileId; - } - - public E2ELocationConstraints getLocationConstraints() { - return locationConstraints; - } - - public void setLocationConstraints( - E2ELocationConstraints locationConstraints) { - this.locationConstraints = locationConstraints; - } - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraints.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraints.java deleted file mode 100644 index 966c057fcc..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ELocationConstraints.java +++ /dev/null @@ -1,54 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2ELocationConstraints { - - @JsonProperty("vimId") - private String vimId; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getVimId() { - return vimId; - } - - public void setVimId(String vimId) { - this.vimId = vimId; - } - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ENsParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ENsParameters.java deleted file mode 100644 index 79aa7e4225..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ENsParameters.java +++ /dev/null @@ -1,67 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalParamForNs", "additionalProperties" }) -public class E2ENsParameters { - - @JsonProperty("locationConstraints") - private List<E2ELocationConstraint> locationConstraints = null; - @JsonProperty("additionalParamForNs") - private E2EAdditionalParamForNs additionalParamForNs; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public List<E2ELocationConstraint> getLocationConstraints() { - return locationConstraints; - } - - public void setLocationConstraints( - List<E2ELocationConstraint> locationConstraints) { - this.locationConstraints = locationConstraints; - } - - public E2EAdditionalParamForNs getAdditionalParamForNs() { - return additionalParamForNs; - } - - public void setAdditionalParamForNs( - E2EAdditionalParamForNs additionalParamForNs) { - this.additionalParamForNs = additionalParamForNs; - } - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EParameters.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EParameters.java deleted file mode 100644 index 58d57bc8bd..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EParameters.java +++ /dev/null @@ -1,79 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2EParameters { - - @JsonProperty("domainHost") - private String domainHost; - @JsonProperty("nodeTemplateName") - private String nodeTemplateName; - @JsonProperty("nodeType") - private String nodeType; - @JsonProperty("segments") - - - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getDomainHost() { - return domainHost; - } - - public void setDomainHost(String domainHost) { - this.domainHost = domainHost; - } - - public String getNodeTemplateName() { - return nodeTemplateName; - } - - public void setNodeTemplateName(String nodeTemplateName) { - this.nodeTemplateName = nodeTemplateName; - } - - public String getNodeType() { - return nodeType; - } - - public void setNodeType(String nodeType) { - this.nodeType = nodeType; - } - - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ESegment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ESegment.java deleted file mode 100644 index 76766fbadd..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2ESegment.java +++ /dev/null @@ -1,95 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2ESegment { - - @JsonProperty("domainHost") - private String domainHost; - @JsonProperty("nodeTemplateName") - private String nodeTemplateName; - @JsonProperty("nodeType") - private String nodeType; - @JsonProperty("segments") - private List<Object> segments = null; - @JsonProperty("nsParameters") - private E2ENsParameters nsParameters; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getDomainHost() { - return domainHost; - } - - public void setDomainHost(String domainHost) { - this.domainHost = domainHost; - } - - public String getNodeTemplateName() { - return nodeTemplateName; - } - - public void setNodeTemplateName(String nodeTemplateName) { - this.nodeTemplateName = nodeTemplateName; - } - - public String getNodeType() { - return nodeType; - } - - public void setNodeType(String nodeType) { - this.nodeType = nodeType; - } - - public List<Object> getSegments() { - return segments; - } - - public void setSegments(List<Object> segments) { - this.segments = segments; - } - - public E2ENsParameters getNsParameters() { - return nsParameters; - } - - public void setNsParameters(E2ENsParameters nsParameters) { - this.nsParameters = nsParameters; - } - - public Map<String, Object> getAdditionalProperties() { - return additionalProperties; - } - - public void setAdditionalProperties(Map<String, Object> additionalProperties) { - this.additionalProperties = additionalProperties; - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EService.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EService.java deleted file mode 100644 index 8e4275c3a9..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EService.java +++ /dev/null @@ -1,94 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2EService { - - @JsonProperty("name") - private String name; - @JsonProperty("description") - private String description; - @JsonProperty("serviceDefId") - private String serviceDefId; - @JsonProperty("templateId") - private String templateId; - @JsonProperty("parameters") - private E2EParameters parameters; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - - public String getServiceDefId() { - return serviceDefId; - } - - public void setServiceDefId(String serviceDefId) { - this.serviceDefId = serviceDefId; - } - - public String getTemplateId() { - return templateId; - } - - public void setTemplateId(String templateId) { - this.templateId = templateId; - } - - public E2EParameters getParameters() { - return parameters; - } - - public void setParameters(E2EParameters parameters) { - this.parameters = parameters; - } - - public Map<String, Object> getAdditionalProperties() { - return this.additionalProperties; - } - - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - -} diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EServiceInstanceRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EServiceInstanceRequest.java deleted file mode 100644 index 38be23dbdd..0000000000 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/E2EServiceInstanceRequest.java +++ /dev/null @@ -1,54 +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.openecomp.mso.apihandlerinfra.serviceinstancebeans; - -import java.util.HashMap; -import java.util.Map; - -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; - -@JsonIgnoreProperties({ "additionalProperties" }) -public class E2EServiceInstanceRequest { - - @JsonProperty("service") - private E2EService service; - @JsonIgnore - private Map<String, Object> additionalProperties = new HashMap<>(); - - public E2EService getService() { - return service; - } - - public void setService(E2EService service) { - this.service = service; - } - - public Map<String, Object> getAdditionalProperties() { - return this.additionalProperties; - } - - public void setAdditionalProperty(String name, Object value) { - this.additionalProperties.put(name, value); - } - -} |