Commit includes ControlLoopPolicy API and bugfixes

Change-Id: I3e18bb8b4c31a0d908bb0cff4c85e2a3fb450a63
Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>

7 files changed, 786 insertions, 0 deletions

diff --git a/ECOMP-ASDC/pom.xml b/ECOMP-ASDC/pom.xml
new file mode 100644
index 000000000..10531f3e9
--- /dev/null
+++ b/ECOMP-ASDC/pom.xml
@@ -0,0 +1,37 @@
+<!--
+  ============LICENSE_START=======================================================
+  ECOMP Policy Engine
+  ================================================================================
+  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=========================================================
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>asdc</artifactId>
+	<parent>
+		<groupId>org.openecomp.policy.engine</groupId>
+		<artifactId>PolicyEngineSuite</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Resource.java b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Resource.java
new file mode 100644
index 000000000..af57afa00
--- /dev/null
+++ b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Resource.java
@@ -0,0 +1,159 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP Policy Engine
+ * ================================================================================
+ * 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.openecomp.policy.asdc;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class Resource implements Serializable {
+
+	private static final long serialVersionUID = -913729158733348027L;
+	
+	private	UUID	resourceUUID;
+	private	UUID	resourceInvariantUUID;
+	private String	resourceName;
+	private String	resourceVersion;
+	private ResourceType	resourceType;
+	
+	public Resource() {
+		//Empty Constructor
+	}
+	
+	public Resource(Resource resource) {
+		this.resourceUUID = resource.resourceUUID;
+		this.resourceInvariantUUID = resource.resourceInvariantUUID;
+		this.resourceName = resource.resourceName;
+		this.resourceVersion = resource.resourceVersion;
+		this.resourceType = resource.resourceType;
+	}
+	
+	public Resource(UUID uuid) {
+		this.resourceUUID = uuid;
+	}
+	
+	public Resource(String name, ResourceType type) {
+		this.resourceName = name;
+		this.resourceType = type;
+	}
+	
+	public Resource(UUID uuid, UUID invariantUUID, String name, String version, ResourceType type) {
+		this.resourceUUID = uuid;
+		this.resourceInvariantUUID = invariantUUID;
+		this.resourceName = name;
+		this.resourceVersion = version;
+		this.resourceType = type;
+	}
+	
+	public UUID getResourceUUID() {
+		return resourceUUID;
+	}
+
+	public void setResourceUUID(UUID resourceUUID) {
+		this.resourceUUID = resourceUUID;
+	}
+
+	public UUID getResourceInvariantUUID() {
+		return resourceInvariantUUID;
+	}
+
+	public void setResourceInvariantUUID(UUID resourceInvariantUUID) {
+		this.resourceInvariantUUID = resourceInvariantUUID;
+	}
+
+	public String getResourceName() {
+		return resourceName;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public ResourceType getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(ResourceType resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	@Override
+	public String toString() {
+		return "Resource [resourceUUID=" + resourceUUID + ", resourceInvariantUUID=" + resourceInvariantUUID
+				+ ", resourceName=" + resourceName + ", resourceVersion=" + resourceVersion + ", resourceType="
+				+ resourceType + "]";
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((resourceInvariantUUID == null) ? 0 : resourceInvariantUUID.hashCode());
+		result = prime * result + ((resourceName == null) ? 0 : resourceName.hashCode());
+		result = prime * result + ((resourceType == null) ? 0 : resourceType.hashCode());
+		result = prime * result + ((resourceUUID == null) ? 0 : resourceUUID.hashCode());
+		result = prime * result + ((resourceVersion == null) ? 0 : resourceVersion.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Resource other = (Resource) obj;
+		if (resourceInvariantUUID == null) {
+			if (other.resourceInvariantUUID != null)
+				return false;
+		} else if (!resourceInvariantUUID.equals(other.resourceInvariantUUID))
+			return false;
+		if (resourceName == null) {
+			if (other.resourceName != null)
+				return false;
+		} else if (!resourceName.equals(other.resourceName))
+			return false;
+		if (resourceType == null) {
+			if (other.resourceType != null)
+				return false;
+		} else if (!resourceType.equals(other.resourceType))
+			return false;
+		if (resourceUUID == null) {
+			if (other.resourceUUID != null)
+				return false;
+		} else if (!resourceUUID.equals(other.resourceUUID))
+			return false;
+		if (resourceVersion == null) {
+			if (other.resourceVersion != null)
+				return false;
+		} else if (!resourceVersion.equals(other.resourceVersion))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceInstance.java b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceInstance.java
new file mode 100644
index 000000000..40d48d9f0
--- /dev/null
+++ b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceInstance.java
@@ -0,0 +1,157 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP Policy Engine
+ * ================================================================================
+ * 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.openecomp.policy.asdc;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class ResourceInstance implements Serializable {
+	private static final long serialVersionUID = -5506162340393802424L;
+
+	private String resourceInstanceName;
+	private String resourceName;
+	private UUID	resourceInvariantUUID;
+	private String resourceVersion;
+	private ResourceType resourceType;
+	private UUID	resourceUUID;
+	
+	public ResourceInstance() {
+		//Empty Constructor
+	}
+	
+	public ResourceInstance(ResourceInstance instance) {
+		if (instance == null) { 
+			return;
+		}
+		this.resourceInstanceName = instance.resourceInstanceName;
+		this.resourceName = instance.resourceName;
+		this.resourceInvariantUUID = instance.resourceInvariantUUID;
+		this.resourceVersion = instance.resourceVersion;
+		this.resourceType = instance.resourceType;
+		this.resourceUUID = instance.resourceUUID;
+	}
+	
+	public String getResourceInstanceName() {
+		return resourceInstanceName;
+	}
+
+	public void setResourceInstanceName(String resourceInstanceName) {
+		this.resourceInstanceName = resourceInstanceName;
+	}
+
+	public String getResourceName() {
+		return resourceName;
+	}
+
+	public void setResourceName(String resourceName) {
+		this.resourceName = resourceName;
+	}
+
+	public UUID getResourceInvariantUUID() {
+		return resourceInvariantUUID;
+	}
+
+	public void setResourceInvariantUUID(UUID resourceInvariantUUID) {
+		this.resourceInvariantUUID = resourceInvariantUUID;
+	}
+
+	public String getResourceVersion() {
+		return resourceVersion;
+	}
+
+	public void setResourceVersion(String resourceVersion) {
+		this.resourceVersion = resourceVersion;
+	}
+
+	public ResourceType getResourceType() {
+		return resourceType;
+	}
+
+	public void setResourceType(ResourceType resourceType) {
+		this.resourceType = resourceType;
+	}
+
+	public UUID getResourceUUID() {
+		return resourceUUID;
+	}
+
+	public void setResourceUUID(UUID resourceUUID) {
+		this.resourceUUID = resourceUUID;
+	}
+
+	@Override
+	public String toString() {
+		return "ResourceInstance [resourceInstanceName=" + resourceInstanceName + ", resourceName=" + resourceName
+				+ ", resourceInvariantUUID=" + resourceInvariantUUID + ", resourceVersion=" + resourceVersion
+				+ ", resourceType=" + resourceType + ", resourceUUID=" + resourceUUID + "]";
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((resourceInstanceName == null) ? 0 : resourceInstanceName.hashCode());
+		result = prime * result + ((resourceInvariantUUID == null) ? 0 : resourceInvariantUUID.hashCode());
+		result = prime * result + ((resourceName == null) ? 0 : resourceName.hashCode());
+		result = prime * result + ((resourceType == null) ? 0 : resourceType.hashCode());
+		result = prime * result + ((resourceUUID == null) ? 0 : resourceUUID.hashCode());
+		result = prime * result + ((resourceVersion == null) ? 0 : resourceVersion.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ResourceInstance other = (ResourceInstance) obj;
+		if (resourceInstanceName == null) {
+			if (other.resourceInstanceName != null)
+				return false;
+		} else if (!resourceInstanceName.equals(other.resourceInstanceName))
+			return false;
+		if (resourceInvariantUUID == null) {
+			if (other.resourceInvariantUUID != null)
+				return false;
+		} else if (!resourceInvariantUUID.equals(other.resourceInvariantUUID))
+			return false;
+		if (resourceName == null) {
+			if (other.resourceName != null)
+				return false;
+		} else if (!resourceName.equals(other.resourceName))
+			return false;
+		if (resourceType != other.resourceType)
+			return false;
+		if (resourceUUID == null) {
+			if (other.resourceUUID != null)
+				return false;
+		} else if (!resourceUUID.equals(other.resourceUUID))
+			return false;
+		if (resourceVersion == null) {
+			if (other.resourceVersion != null)
+				return false;
+		} else if (!resourceVersion.equals(other.resourceVersion))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceType.java b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceType.java
new file mode 100644
index 000000000..426b3907c
--- /dev/null
+++ b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ResourceType.java
@@ -0,0 +1,40 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP Policy Engine
+ * ================================================================================
+ * 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.openecomp.policy.asdc;
+
+public enum ResourceType {
+	VF("VF"),
+	VFC("VFC"),
+	VL("VL"),
+	CP("CP")
+	;
+	
+	private String type;
+	
+	private ResourceType(String type) {
+		this.type = type;
+	}
+
+	public String	toString() {
+		return this.type;
+	}
+	
+}
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Service.java b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Service.java
new file mode 100644
index 000000000..b7b5d3cb5
--- /dev/null
+++ b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/Service.java
@@ -0,0 +1,140 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP Policy Engine
+ * ================================================================================
+ * 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.openecomp.policy.asdc;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class Service implements Serializable {
+
+	private static final long serialVersionUID = -1249276698549996806L;
+	
+	private UUID		serviceUUID;
+	private UUID		serviceInvariantUUID;
+	private String	serviceName;
+	private String	serviceVersion;
+	
+	public Service() {
+		//Empty Constructor
+	}
+	
+	public Service(UUID uuid) {
+		this.serviceUUID = uuid;
+	}
+	
+	public Service(String name) {
+		this.serviceName = name;
+	}
+	
+	public Service(UUID uuid, UUID invariantUUID, String name, String version) {
+		this.serviceUUID = uuid;
+		this.serviceInvariantUUID = invariantUUID;
+		this.serviceName = name;
+		this.serviceVersion = version;
+	}
+	
+	public Service(Service service) {
+		this.serviceUUID = service.serviceUUID;
+		this.serviceInvariantUUID = service.serviceInvariantUUID;
+		this.serviceName = service.serviceName;
+		this.serviceVersion = service.serviceVersion;
+	}
+	
+	public UUID getServiceUUID() {
+		return serviceUUID;
+	}
+
+	public void setServiceUUID(UUID serviceUUID) {
+		this.serviceUUID = serviceUUID;
+	}
+
+	public UUID getServiceInvariantUUID() {
+		return serviceInvariantUUID;
+	}
+
+	public void setServiceInvariantUUID(UUID serviceInvariantUUID) {
+		this.serviceInvariantUUID = serviceInvariantUUID;
+	}
+
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+
+	public String getServiceVersion() {
+		return serviceVersion;
+	}
+
+	public void setServiceVersion(String serviceVersion) {
+		this.serviceVersion = serviceVersion;
+	}
+
+	@Override
+	public String toString() {
+		return "Service [serviceUUID=" + serviceUUID + ", serviceInvariantUUID=" + serviceInvariantUUID
+				+ ", serviceName=" + serviceName + ", serviceVersion=" + serviceVersion + "]";
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((serviceInvariantUUID == null) ? 0 : serviceInvariantUUID.hashCode());
+		result = prime * result + ((serviceName == null) ? 0 : serviceName.hashCode());
+		result = prime * result + ((serviceUUID == null) ? 0 : serviceUUID.hashCode());
+		result = prime * result + ((serviceVersion == null) ? 0 : serviceVersion.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Service other = (Service) obj;
+		if (serviceInvariantUUID == null) {
+			if (other.serviceInvariantUUID != null)
+				return false;
+		} else if (!serviceInvariantUUID.equals(other.serviceInvariantUUID))
+			return false;
+		if (serviceName == null) {
+			if (other.serviceName != null)
+				return false;
+		} else if (!serviceName.equals(other.serviceName))
+			return false;
+		if (serviceUUID == null) {
+			if (other.serviceUUID != null)
+				return false;
+		} else if (!serviceUUID.equals(other.serviceUUID))
+			return false;
+		if (serviceVersion == null) {
+			if (other.serviceVersion != null)
+				return false;
+		} else if (!serviceVersion.equals(other.serviceVersion))
+			return false;
+		return true;
+	}
+
+}
diff --git a/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ServiceInstance.java b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ServiceInstance.java
new file mode 100644
index 000000000..40a08fd93
--- /dev/null
+++ b/ECOMP-ASDC/src/main/java/org/openecomp/policy/asdc/ServiceInstance.java
@@ -0,0 +1,177 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP Policy Engine
+ * ================================================================================
+ * 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.openecomp.policy.asdc;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public class ServiceInstance implements Serializable {
+	private static final long serialVersionUID = 6285260780966679625L;
+
+	private UUID		personaModelUUID;
+	private UUID		serviceUUID;
+	private UUID		serviceInstanceUUID;
+	private UUID		widgetModelUUID;
+	private String	widgetModelVersion;
+	private String	serviceName;
+	private String	serviceInstanceName;
+	
+	public ServiceInstance() {
+		//Empty Constructor
+	}
+	
+	public ServiceInstance(ServiceInstance instance) {
+		if (instance == null) {
+			return;
+		}
+		this.personaModelUUID = instance.personaModelUUID;
+		this.serviceUUID = instance.serviceUUID;
+		this.serviceInstanceUUID = instance.serviceInstanceUUID;
+		this.widgetModelUUID = instance.widgetModelUUID;
+		this.widgetModelVersion = instance.widgetModelVersion;
+		this.serviceName = instance.serviceName;
+		this.serviceInstanceName = instance.serviceInstanceName;
+	}
+	
+	public UUID getPersonaModelUUID() {
+		return personaModelUUID;
+	}
+
+	public void setPersonaModelUUID(UUID personaModelUUID) {
+		this.personaModelUUID = personaModelUUID;
+	}
+
+	public UUID getServiceUUID() {
+		return serviceUUID;
+	}
+
+	public void setServiceUUID(UUID serviceUUID) {
+		this.serviceUUID = serviceUUID;
+	}
+
+	public UUID getServiceInstanceUUID() {
+		return serviceInstanceUUID;
+	}
+
+	public void setServiceInstanceUUID(UUID serviceInstanceUUID) {
+		this.serviceInstanceUUID = serviceInstanceUUID;
+	}
+
+	public UUID getWidgetModelUUID() {
+		return widgetModelUUID;
+	}
+
+	public void setWidgetModelUUID(UUID widgetModelUUID) {
+		this.widgetModelUUID = widgetModelUUID;
+	}
+
+	public String getWidgetModelVersion() {
+		return widgetModelVersion;
+	}
+
+	public void setWidgetModelVersion(String widgetModelVersion) {
+		this.widgetModelVersion = widgetModelVersion;
+	}
+
+	public String getServiceName() {
+		return serviceName;
+	}
+
+	public void setServiceName(String serviceName) {
+		this.serviceName = serviceName;
+	}
+
+	public String getServiceInstanceName() {
+		return serviceInstanceName;
+	}
+
+	public void setServiceInstanceName(String serviceInstanceName) {
+		this.serviceInstanceName = serviceInstanceName;
+	}
+
+	@Override
+	public String toString() {
+		return "ServiceInstance [personaModelUUID=" + personaModelUUID + ", serviceUUID=" + serviceUUID
+				+ ", serviceInstanceUUID=" + serviceInstanceUUID + ", widgetModelUUID=" + widgetModelUUID
+				+ ", widgetModelVersion=" + widgetModelVersion + ", serviceName=" + serviceName
+				+ ", serviceInstanceName=" + serviceInstanceName + "]";
+	}
+	@Override
+	public int hashCode() {
+		final int prime = 31;
+		int result = 1;
+		result = prime * result + ((personaModelUUID == null) ? 0 : personaModelUUID.hashCode());
+		result = prime * result + ((serviceInstanceName == null) ? 0 : serviceInstanceName.hashCode());
+		result = prime * result + ((serviceInstanceUUID == null) ? 0 : serviceInstanceUUID.hashCode());
+		result = prime * result + ((serviceName == null) ? 0 : serviceName.hashCode());
+		result = prime * result + ((serviceUUID == null) ? 0 : serviceUUID.hashCode());
+		result = prime * result + ((widgetModelUUID == null) ? 0 : widgetModelUUID.hashCode());
+		result = prime * result + ((widgetModelVersion == null) ? 0 : widgetModelVersion.hashCode());
+		return result;
+	}
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		ServiceInstance other = (ServiceInstance) obj;
+		if (personaModelUUID == null) {
+			if (other.personaModelUUID != null)
+				return false;
+		} else if (!personaModelUUID.equals(other.personaModelUUID))
+			return false;
+		if (serviceInstanceName == null) {
+			if (other.serviceInstanceName != null)
+				return false;
+		} else if (!serviceInstanceName.equals(other.serviceInstanceName))
+			return false;
+		if (serviceInstanceUUID == null) {
+			if (other.serviceInstanceUUID != null)
+				return false;
+		} else if (!serviceInstanceUUID.equals(other.serviceInstanceUUID))
+			return false;
+		if (serviceName == null) {
+			if (other.serviceName != null)
+				return false;
+		} else if (!serviceName.equals(other.serviceName))
+			return false;
+		if (serviceUUID == null) {
+			if (other.serviceUUID != null)
+				return false;
+		} else if (!serviceUUID.equals(other.serviceUUID))
+			return false;
+		if (widgetModelUUID == null) {
+			if (other.widgetModelUUID != null)
+				return false;
+		} else if (!widgetModelUUID.equals(other.widgetModelUUID))
+			return false;
+		if (widgetModelVersion == null) {
+			if (other.widgetModelVersion != null)
+				return false;
+		} else if (!widgetModelVersion.equals(other.widgetModelVersion))
+			return false;
+		return true;
+	}
+	
+}
diff --git a/ECOMP-ASDC/src/main/resources/definitions.yaml b/ECOMP-ASDC/src/main/resources/definitions.yaml
new file mode 100644
index 000000000..6fb1f7cfa
--- /dev/null
+++ b/ECOMP-ASDC/src/main/resources/definitions.yaml
@@ -0,0 +1,76 @@
+Service:
+  type: Object
+  properties:
+    serviceUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    serviceInvariantUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    serviceName:
+      type: string
+    serviceVersion:
+      type: string
+Resource:
+  type: Object
+  properties:
+    resourceUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    resourceInvariantUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    resourceName:
+      type: string
+    resourceVersion:
+      type: string
+    resourceType:
+      type: string
+      valid_values:
+        - VF
+        - VFC
+        - CP
+        - VL
+ServiceInstance:
+  type: Object
+  properties:
+    personaModelUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    serviceUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    serviceInstanceUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    widgetModelUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    widgetModelVersion:
+      type: string
+    serviceName:
+      type: string
+    serviceInstanceName:
+      type: string
+ResourceInstance:
+  type: object
+  properties:
+    resourceInstanceName:
+      type: string
+    resourceName:
+      type: string
+    resourceInvariantUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"
+    resourceVersion:
+      type: string
+    resourceType:
+      type: string
+      valid_values:
+        - VF
+        - VFC
+        - CP
+        - VL
+    resourceUUID:
+      type: string
+      pattern: "^[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}$"