[VID-55] Upgrade Tosca Parser (merge)

Change-Id: I5389f1641ef22df3ed569a154b3c367117c04d04
Signed-off-by: Ofir Sonsino <os0695@att.com>

1 files changed, 0 insertions, 30 deletions

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
index 41c7ca5b..d42c1f15 100755
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
@@ -61,9 +61,6 @@ public class ToscaMetadata {
 	/** The resource vendor release. */

 	private String resourceVendorRelease;

 	

-	/** the resourceVendorModelNumber */

-	private String resourceVendorModelNumber;

-

 	/** The service ecomp naming. */

 	private String serviceEcompNaming;

 	

@@ -91,11 +88,6 @@ public class ToscaMetadata {
 	

 	/** The vf module model version. */

 	private String vfModuleModelVersion;

-

-        /** serviceType */

-        private String serviceType;

-        /** serviceRole */

-        private String serviceRole;

 	

 	/**

 	 * Instantiates a new tosca metadata.

@@ -466,26 +458,4 @@ public class ToscaMetadata {
 		

 		return vfModuleModelCustomizationUUID;

 	}

-

-        /** serviceType */

-        public String getServiceType() {

-                return serviceType;

-        }

-        public void setServiceType(String serviceType) {

-                this.serviceType= serviceType;

-        }

-        /** serviceRole */

-        public String getServiceRole() {

-                return serviceRole;

-        }

-        public void setServiceRole(String serviceRole) {

-                this.serviceRole= serviceRole;

-        }

-        /** resourceVendorModelNumber */

-        public String getResourceVendorModelNumber() {

-                return resourceVendorModelNumber;

-        }

-        public void setResourceVendorModelNumber(String resourceVendorModelNumber) {

-                this.resourceVendorModelNumber= resourceVendorModelNumber;

-        }

 }