From a8d3e1b8c759c21227690a425552a245da883e97 Mon Sep 17 00:00:00 2001 From: zhaoxiangjun666 Date: Thu, 10 Sep 2020 14:01:50 +0800 Subject: Support for Test Topology Auto Design- Service Import MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add some test code and use lombok in catalog-model Test Topology Auto Design （NFV Testing Automatic Platform） Delete useless test code and add test code for new function Issue-ID: SDC-3179 Issue-ID: SDC-3085 Signed-off-by: zhaoxiangjun666 Change-Id: I7f555633a00848c273014caa18ea0e30d0b22113 --- .../be/datatypes/components/ServiceMetadataDataDefinition.java | 10 ++++++++++ .../org/openecomp/sdc/be/datatypes/enums/ResourceTypeEnum.java | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'common-be/src') diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java index cf35f5d387..b8cc269bdf 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java @@ -23,6 +23,8 @@ package org.openecomp.sdc.be.datatypes.components; import lombok.Data; import lombok.NoArgsConstructor; import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFieldsExtractor; +import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; + @Data @NoArgsConstructor @@ -53,11 +55,19 @@ public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefiniti private String environmentContext; + private String serviceVendorModelNumber; + public Boolean isAbstract; + private ResourceTypeEnum importServiceType = ResourceTypeEnum.SERVICE; + private String toscaServiceName; + private String vendorName; + private String vendorRelease; public ServiceMetadataDataDefinition(ServiceMetadataDataDefinition other) { super(other); serviceType = other.getServiceType(); serviceRole = other.getServiceRole(); + this.importServiceType = other.getImportServiceType(); + this.toscaServiceName = other.getToscaServiceName(); serviceFunction = other.getServiceFunction(); } diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ResourceTypeEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ResourceTypeEnum.java index 4201b79d6a..2af43dcf78 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ResourceTypeEnum.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/ResourceTypeEnum.java @@ -35,7 +35,8 @@ public enum ResourceTypeEnum { Configuration("Configuration", true), ServiceProxy("ServiceProxy", true), //Generic VFC/VF/PNF/Service Type - ABSTRACT("Abstract", true); + ABSTRACT("Abstract", true), + SERVICE("Service"/*(Network Service)"*/,false); private final String value; private final boolean isAtomicType; -- cgit 1.2.3-korg