Allow vLB to check multiple vDNSs

Modify the health check plugin to allow the vLB to run health check against multiple vDNS instances

Change-Id: Ia0d577750378f5c7631be88be85b42d090a71289
Issue-ID: INT-433
Signed-off-by: Marco Platania <platania@research.att.com>

3 files changed, 48 insertions, 18 deletions

diff --git a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/ElementCrudService.java b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/ElementCrudService.java
index d17c6c18..2a926036 100644
--- a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/ElementCrudService.java
+++ b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/ElementCrudService.java
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+ /*
+ * Modifications copyright (c) 2018 AT&T Intellectual Property
+ */
+
 package org.onap.vnf.vlb;
 
 import io.fd.honeycomb.translate.read.ReadFailedException;
@@ -101,7 +105,8 @@ final class ElementCrudService implements CrudService<VdnsInstance> {
         return new VdnsInstanceBuilder()
                 .setIpAddr(key.getIpAddr())
                 .setKey(key)
-                .setIsEnabled(true)
+                .setOamIpAddr("10.0.80.0")
+                .setEnabled(true)
                 .build();
     }
 
diff --git a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/DnsInstanceManager.java b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/DnsInstanceManager.java
index dc3e9248..3740076b 100644
--- a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/DnsInstanceManager.java
+++ b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/DnsInstanceManager.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vlb.business.vnf.onap.plugin.rev160918.vlb.business.vnf.onap.plugin.params.vdns.instances.VdnsInstance;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,26 +49,40 @@ import org.slf4j.LoggerFactory;
 
 public class DnsInstanceManager {
 
+	private static DnsInstanceManager thisInstance = null;
 	private static final Logger LOG = LoggerFactory.getLogger(DnsInstanceManager.class);
-	private Map<String, Boolean> dnsInstances = new HashMap<String, Boolean>();
+	private Map<String, VdnsInstance> dnsInstances = new HashMap<String, VdnsInstance>();
 
 	/*
 	 * Add a new DNS instance to the map and create a GRE tunnel 
 	 * towards that instance if isEnabled is set to true.
 	 */
-	void addDnsInstance(String ipAddr, Boolean isEnabled) {
+
+	public static DnsInstanceManager getInstance() {
+		if(thisInstance == null) {
+			thisInstance = new DnsInstanceManager();
+		}
+
+		return thisInstance;
+	}
+
+	private DnsInstanceManager() {
+
+	}
+
+	void addDnsInstance(String ipAddr, VdnsInstance data) {
 		// Call updateDnsInstance in case the DNS instance already exists.
 		// This is somewhat redundant because Honeycomb already runs this check.
 		if(dnsInstances.containsKey(ipAddr)) {
-			updateDnsInstance(ipAddr, isEnabled);
+			updateDnsInstance(ipAddr, data);
 			return;
 		}
 
-		dnsInstances.put(ipAddr, isEnabled);
-		LOG.debug("DNS instance " + ipAddr + " with status isEnabled=" + isEnabled + " has been added.");
+		dnsInstances.put(ipAddr, data);
+		LOG.debug("DNS instance " + ipAddr + " with status isEnabled=" + data.isEnabled() + " has been added.");
 
 		// Create a GRE tunnel towards the new DNS instance if isEnabled is true.
-		if(isEnabled) {
+		if(data.isEnabled()) {
 			addGreTunnel(ipAddr);
 		}
 	}
@@ -75,14 +91,15 @@ public class DnsInstanceManager {
 	 * Update an existing DNS instance and create or remove a GRE
 	 * tunnel based on the current value of the isEnabled flag.
 	 */
-	void updateDnsInstance(String ipAddr, Boolean isEnabled) {
+	void updateDnsInstance(String ipAddr, VdnsInstance data) {
 		// This is somewhat redundant because Honeycomb already runs this check.
-		if(dnsInstances.get(ipAddr) == isEnabled) {
+		boolean isEnabled = data.isEnabled();
+		if(dnsInstances.get(ipAddr).isEnabled() == isEnabled) {
 			LOG.debug("DNS instance " + ipAddr + " with status isEnabled=" + isEnabled + " already exists. No update is necessary.");
 			return;
 		}
 
-		dnsInstances.put(ipAddr, isEnabled);
+		dnsInstances.put(ipAddr, data);
 		LOG.debug("DNS instance " + ipAddr + " has been updated with status isEnabled=" + isEnabled + ".");
 
 		if(isEnabled) {
@@ -105,7 +122,7 @@ public class DnsInstanceManager {
 		}
 
 		// Remove a GRE tunnel towards this DNS instance if it exists.
-		if(dnsInstances.get(ipAddr)) {
+		if(dnsInstances.get(ipAddr).isEnabled()) {
 			deleteGreTunnel(ipAddr);
 		}
 
@@ -139,4 +156,11 @@ public class DnsInstanceManager {
 			e.printStackTrace();
 		}
 	}
-}
+
+	/*
+	 * Auxiliary function that returns vDNS instances as map.
+	 */
+	public Map<String, VdnsInstance> getDnsInstancesAsMap() {
+		return dnsInstances;
+	}
+}
\ No newline at end of file
diff --git a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/ElementCustomizer.java b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/ElementCustomizer.java
index d8da0b5b..10457a60 100644
--- a/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/ElementCustomizer.java
+++ b/vnfs/vLBMS/apis/vlb-business-vnf-onap-plugin/vlb-business-vnf-onap-plugin-impl/src/main/java/org/onap/vnf/vlb/write/ElementCustomizer.java
@@ -14,6 +14,10 @@
  * limitations under the License.
  */
 
+ /*
+ * Modifications copyright (c) 2018 AT&T Intellectual Property
+ */
+
 package org.onap.vnf.vlb.write;
 
 import org.onap.vnf.vlb.CrudService;
@@ -24,8 +28,6 @@ import javax.annotation.Nonnull;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vlb.business.vnf.onap.plugin.rev160918.vlb.business.vnf.onap.plugin.params.vdns.instances.VdnsInstance;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vlb.business.vnf.onap.plugin.rev160918.vlb.business.vnf.onap.plugin.params.vdns.instances.VdnsInstanceKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Writer for {@link Element} list node from our YANG model.
@@ -34,11 +36,10 @@ public final class ElementCustomizer implements ListWriterCustomizer<VdnsInstanc
 
     private final CrudService<VdnsInstance> crudService;
     private DnsInstanceManager dnsInstanceManager;
-    private static final Logger LOG = LoggerFactory.getLogger(ElementCustomizer.class);
 
     public ElementCustomizer(@Nonnull final CrudService<VdnsInstance> crudService) {
         this.crudService = crudService;
-        dnsInstanceManager = new DnsInstanceManager();
+        dnsInstanceManager = DnsInstanceManager.getInstance();
     }
 
     @Override
@@ -47,7 +48,7 @@ public final class ElementCustomizer implements ListWriterCustomizer<VdnsInstanc
         //perform write of data,or throw exception
         //invoked by PUT operation,if provided data doesn't exist in Config data
         crudService.writeData(id, dataAfter);
-        dnsInstanceManager.addDnsInstance(dataAfter.getIpAddr(), dataAfter.isIsEnabled());
+        dnsInstanceManager.addDnsInstance(dataAfter.getIpAddr(), dataAfter);
     }
 
     @Override
@@ -58,7 +59,7 @@ public final class ElementCustomizer implements ListWriterCustomizer<VdnsInstanc
         //perform update of data,or throw exception
         //invoked by PUT operation,if provided data does exist in Config data
         crudService.updateData(id, dataBefore, dataAfter);
-        dnsInstanceManager.updateDnsInstance(dataAfter.getIpAddr(), dataAfter.isIsEnabled());
+        dnsInstanceManager.updateDnsInstance(dataAfter.getIpAddr(), dataAfter);
     }
 
     @Override