implement removal of hostname from whitelist via enum option

Author: d-shapiro

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/HostnameWhitelist.java

@@ -1,7 +1,6 @@
 package com.acuity.iot.dsa.dslink.sys.cert;
 
 import org.iot.dsa.node.DSBool;
-import org.iot.dsa.node.DSElement;
 import org.iot.dsa.node.DSIValue;
 import org.iot.dsa.node.DSInfo;
 import org.iot.dsa.node.DSJavaEnum;
@@ -18,6 +17,10 @@ public static enum WhitelistValue {
         ALLOWED, FORBIDDEN;
     }
 
+    public static enum WhitelistOption {
+        ALLOWED, FORBIDDEN, REMOVE;
+    }
+    
     private static final String ENABLED = "Enabled";
     private static final String ADD_HOSTNAME = "Add Hostname";
 
@@ -54,8 +57,9 @@ public ActionResult invoke(DSInfo info, ActionInvocation invocation) {
 
     private void addHostname(DSMap parameters) {
         String hostname = parameters.getString("Hostname");
-        DSElement status = parameters.get("Status");
-        put(hostname, status).setRemovable(true);
+        String statusStr = parameters.getString("Status");
+        WhitelistOption option = WhitelistOption.valueOf(statusStr);
+        put(hostname, DSJavaEnum.valueOf(option));
     }
 
     public WhitelistValue checkHostname(String hostname) {
@@ -70,5 +74,15 @@ public WhitelistValue checkHostname(String hostname) {
             return null;
         }
     }
+    
+    protected void onChildChanged(DSInfo info) {
+        if (info.isValue()) {
+            String val = info.getValue().toElement().toString();
+            if (WhitelistOption.REMOVE.name().equals(val)) {
+                remove(info);
+            }
+        }
+    }
+    
 
 }

dslink-v2/src/main/java/com/acuity/iot/dsa/dslink/sys/cert/SysCertManager.java

@@ -23,7 +23,6 @@
 //import org.bouncycastle.pkcs.jcajce.JcaPKCS10CertificationRequestBuilder;
 import org.iot.dsa.node.DSBool;
 import org.iot.dsa.node.DSInfo;
-import org.iot.dsa.node.DSList;
 import org.iot.dsa.node.DSMap;
 import org.iot.dsa.node.DSNode;
 import org.iot.dsa.node.DSString;