[SDC] rebase 1710 code

[sdc.git] / catalog-model / src / main / java / org / openecomp / sdc / be / model / Resource.java

diff --git a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
index a9c6b44..45fc5f6 100644 (file)
--- a/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
+++ b/catalog-model/src/main/java/org/openecomp/sdc/be/model/Resource.java
@@ -255,6 +255,11 @@ public class Resource extends Component implements Serializable {
                ((ResourceMetadataDataDefinition) getComponentMetadataDefinition().getMetadataDataDefinition())
                                .setVendorRelease(vendorRelease);
        }
+       
+       public void setResourceVendorModelNumber(String resourceVendorModelNumber){
+               ((ResourceMetadataDataDefinition) getComponentMetadataDefinition().getMetadataDataDefinition()).
+               setResourceVendorModelNumber(resourceVendorModelNumber);
+       }
 
        public String getVendorName() {
                return ((ResourceMetadataDataDefinition) getComponentMetadataDefinition().getMetadataDataDefinition())
@@ -266,6 +271,11 @@ public class Resource extends Component implements Serializable {
                                .getVendorRelease();
        }
        
+       public String getResourceVendorModelNumber(){
+               return ((ResourceMetadataDataDefinition) getComponentMetadataDefinition().getMetadataDataDefinition())
+                               .getResourceVendorModelNumber();
+       }
+       
        @Override
        public String fetchGenericTypeToscaNameFromConfig(){
                String result = super.fetchGenericTypeToscaNameFromConfig();
@@ -282,7 +292,7 @@ public class Resource extends Component implements Serializable {
        @Override
        public boolean shouldGenerateInputs(){
                //TODO add complex VFC condition when supported
-               return ResourceTypeEnum.VF == this.getResourceType();
+               return ResourceTypeEnum.VF == this.getResourceType() || ResourceTypeEnum.CVFC == this.getResourceType() || ResourceTypeEnum.PNF == this.getResourceType();
        }
        
        @Override