[SDNC-5] Rebase SDN-C adaptors

Apply latest bug fixes, enhancements and port to OpenDaylight Boron.

Change-Id: Ia7d29986eb12f98edbf075dae3cc9343af6791b6
Signed-off-by: Dan Timoney <dtimoney@att.com>

1 files changed, 22 insertions, 3 deletions

diff --git a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java b/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java
index ff000fe..d344acb 100644
--- a/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java
+++ b/resource-assignment/provider/src/main/java/org/openecomp/sdnc/ra/check/VpeLockCheck.java
@@ -3,7 +3,7 @@
  * openECOMP : SDN-C
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
- *             reserved.
+ * 						reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -55,14 +55,20 @@ public class VpeLockCheck implements EquipmentCheck {
 		if (vpeLock == null)
 			return true;
 
+		if (vpeLock.equals("vpe-total-lock")) {
+			log.info("Skipping VPE " + vpeName + ": There is a " + vpeLock + " on it.");
+			return false;
+		}
+
 		if (vpeLock.equals("vpe-vrf-lock") && requiresNewVrf(equipData.equipmentId, vrfName)) {
 			log.info("Skipping VPE " + vpeName + ": There is a " + vpeLock +
 			        " on it and it requires a new VRF for VPN: " + vrfName + ".");
 			return false;
 		}
 
-		if (vpeLock.equals("vpe-total-lock")) {
-			log.info("Skipping VPE " + vpeName + ": There is a " + vpeLock + " on it.");
+		if (vpeLock.equals("vpe-mvrf-lock") && requiresNewMVrf(equipData.equipmentId, vrfName)) {
+			log.info("Skipping VPE " + vpeName + ": There is a " + vpeLock +
+			        " on it and it requires a new multicast VRF for VPN: " + vrfName + ".");
 			return false;
 		}
 
@@ -82,6 +88,19 @@ public class VpeLockCheck implements EquipmentCheck {
 		return true;
 	}
 
+	boolean requiresNewMVrf(String equipmentId, String vrfName) {
+		Resource r = resourceManager.getResource("MVRF", equipmentId);
+		if (r == null || r.allocationItems == null)
+			return true;
+
+		for (AllocationItem ai : r.allocationItems) {
+			if (ai.resourceShareGroupList.contains(vrfName))
+				return false;
+		}
+
+		return true;
+	}
+
 	public void setVpeLockDao(VpeLockDao vpeLockDao) {
 		this.vpeLockDao = vpeLockDao;
 	}