1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 25 insertions, 0 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
index 5ea171e93b..e1b2c7c5e0 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/ServiceToNetworks.java
@@ -57,6 +57,31 @@ public class ServiceToNetworks implements Serializable {
 	}
 
 	@Override
+	public boolean equals(Object o) {
+        if (!(o instanceof ServiceToNetworks)) {
+            return false;
+        }
+        if (this == o) {
+            return true;
+        }
+        ServiceToNetworks stn = (ServiceToNetworks) o;
+        if (stn.getNetworkModelCustomizationUuid().equals(this.getNetworkModelCustomizationUuid())
+        		&& stn.getServiceModelUuid().equals(this.getServiceModelUuid())) {
+            return true;
+        } 
+        return false;
+	}
+	
+	@Override 
+	public int hashCode() {
+		
+		int code = this.networkModelCustomizationUuid == null ? 0 : this.networkModelCustomizationUuid.hashCode();
+		code += this.serviceModelUuid == null ? 0 : this.serviceModelUuid.hashCode();
+		
+		return code;
+	}
+	
+	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("ServiceToNetworks mapping: ");