Integrating D-Link alarm into Home Security benchmark

diff --git a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
index 3b7cf539640af43d5b9264b2c513edadc29602e2..09c0527dce1cfe94e6ce4766ceccfc26bf563fc3 100644 (file)
--- a/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
+++ b/benchmarks/Java/HomeSecurityController/HomeSecurityController.java
@@ -43,7 +43,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt
        private static final int MOTION_TIME_THRESHOLD = 60;    // in seconds
        private static final int CAMERA_FPS = 15;
        private static final int CHECK_TIME_WAIT = 1;                   // in seconds
-       private static final int SECOND_TO_TURN_ON = 60;                // in seconds
+       private static final int SECOND_TO_TURN_ON = -1;                // in seconds
        private static final int SECOND_TO_TURN_OFF = 1;                // in seconds
        private static final int LOCK_DOOR = 0;
        private static final int UNLOCK_DOOR = 1;
@@ -477,7 +477,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt
                // Get and init the alarm (this single alarm set can serve multiple zones / rooms)
                Iterator alarmIt = alarmSet.iterator();
                AlarmSmart alm = (AlarmSmart) alarmIt.next();
-               alm.setZone(zoneId, true, SECOND_TO_TURN_OFF);
+               alm.setZone(zoneId, true, SECOND_TO_TURN_ON);
                updateIoTCloud("alarm", ACTIVE);
        }
 
@@ -492,7 +492,7 @@ public class HomeSecurityController implements SmartthingsSensorCallback, Smartt
                Iterator alarmIt = alarmSet.iterator();
                AlarmSmart alm = (AlarmSmart) alarmIt.next();
                // Turn this alarm off indefinitely
-               alm.setZone(zoneId, false, SECOND_TO_TURN_ON);
+               alm.setZone(zoneId, false, SECOND_TO_TURN_OFF);
                updateIoTCloud("alarm", NOT_ACTIVE);
        }
 

diff --git a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
index 6b0ee185b2c024dfd1d3bdf6e769afe27d66037e..e19b37545a61cf572b2d2fe89049105eaca6b805 100644 (file)
--- a/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
+++ b/benchmarks/drivers/Java/DlinkAlarm/DlinkAlarm.java
@@ -454,27 +454,6 @@ public class DlinkAlarm implements Alarm {
         // Return time since January 1, 1970 00:00:00 UTC in seconds
         return System.currentTimeMillis()/1000;
     }
-    
-    /*public static void main(String[] args) throws Exception {
-
-        String ipAddress = "192.168.1.183";
-        String devicePin = "215530";
-        IoTDeviceAddress iotAddress = new IoTDeviceAddress(ipAddress, 12345, 80, false, false);
-        Set<IoTDeviceAddress> setAddress = new HashSet<IoTDeviceAddress>();
-        setAddress.add(iotAddress);
-        IoTSet<IoTDeviceAddress> iotSetAddress = new IoTSet<IoTDeviceAddress>(setAddress);
-        
-        DlinkAlarm alarm = new DlinkAlarm(iotSetAddress, devicePin);
-        alarm.init();
-        // Set alarm
-        alarm.setZone(0, true, -1);
-        // Set alarm
-        alarm.setZone(0, false, 0);
-        // Set alarm
-        alarm.setZone(0, true, -1);
-        // Set alarm
-        alarm.setZone(0, false, 0);
-    }*/
 }
 
 

diff --git a/iotjava/iotruntime/master/IoTMaster.java b/iotjava/iotruntime/master/IoTMaster.java
index 7dc41d7a2b2274c70ba2c1ccb79b1102be9ef372..3ce672d7c07f7eb3bda5e24df11b46bf18723c18 100644 (file)
--- a/iotjava/iotruntime/master/IoTMaster.java
+++ b/iotjava/iotruntime/master/IoTMaster.java
@@ -740,7 +740,7 @@ public final class IoTMaster {
                                routerConfig.configureHostHTTPPolicies(strIoTSlaveObjectHostAdd, strIoTSlaveObjectHostAdd, strDeviceAddress);
                                // Configure MAC policies
                                if (STR_ACTIVATE_SANDBOXING.equals("Yes"))
-                                       processJailConfig.configureProcessJailGWDevicePolicies(strIoTSlaveObjectHostAdd, STR_ROUTER_ADD, INT_DNS_PORT);
+                                       processJailConfig.configureProcessJailGWDevicePolicies(strIoTSlaveObjectHostAdd, STR_ROUTER_ADD, strDeviceAddress, INT_DNS_PORT);
                        } else {
                                // Other port numbers...
                                commHan.addDevicePort(iDestDeviceDriverPort);

diff --git a/iotjava/iotruntime/master/ProcessJailConfig.java b/iotjava/iotruntime/master/ProcessJailConfig.java
index 757313a486ca70eb7891ae26de5a35bbdc1ff161..e19ee151f6b50e7488b4a5b49f4b13a93b930295 100644 (file)
--- a/iotjava/iotruntime/master/ProcessJailConfig.java
+++ b/iotjava/iotruntime/master/ProcessJailConfig.java
@@ -46,6 +46,9 @@ public final class ProcessJailConfig {
        private static final String STR_DEV_IP_ADDRESS          = "<dev-ip-address>";
        private static final String STR_DEV_COM_PORT            = "<dev-com-port>";
        private static final String STR_DEV_PORT                        = "<dev-port>";
+       
+    private static final int INT_HTTP_PORT = 80;
+    private static final int INT_DNS_PORT  = 53;
 
 
        /**
@@ -326,12 +329,13 @@ public final class ProcessJailConfig {
         * @param   iPort                                       Integer port
         * @return  void
         */
-       public void configureProcessJailGWDevicePolicies(String strConfigHost, String strRouterAddress, int iPort) {
+       public void configureProcessJailGWDevicePolicies(String strConfigHost, String strRouterAddress, String strDeviceIPAddress, int iPort) {
 
                PrintWriter pwConfig = getPrintWriter(strConfigHost);
                pwConfig.println("file read /home/iotuser/iot2/iotjava/iotruntime/\\*.jks");
                pwConfig.println("file read /etc/resolv.conf");
                pwConfig.println("file read /etc/hosts");
+       pwConfig.println("network inet stream connect ::ffff:" + strDeviceIPAddress + " " + String.valueOf(INT_HTTP_PORT));     // HTTP access for this address
                pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(iPort));
        }
 
@@ -351,8 +355,8 @@ public final class ProcessJailConfig {
                pwConfig.println("file read /etc/resolv.conf");
                pwConfig.println("file read /etc/hosts");
                pwConfig.println("file read /etc/host.conf");
-               pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(53));     // TCP/UDP access through router
-               pwConfig.println("network inet stream connect ::ffff:" + strAddress + " " + String.valueOf(80));        // HTTP access for this address
+               pwConfig.println("network inet dgram send " + strRouterAddress + " " + String.valueOf(INT_DNS_PORT));   // TCP/UDP access through router
+               pwConfig.println("network inet stream connect ::ffff:" + strAddress + " " + String.valueOf(INT_HTTP_PORT));     // HTTP access for this address
        }
 
 

diff --git a/localconfig/mysql/alarmSet.config b/localconfig/mysql/alarmSet.config
index 40e745a62cb7c46e722353092b3d62f23d57679e..c1d125a0846dd06202c33a6bc640011947d4bf73 100644 (file)
--- a/localconfig/mysql/alarmSet.config
+++ b/localconfig/mysql/alarmSet.config
@@ -1,3 +1,5 @@
 SELECT * FROM
 AlarmSmart
+WHERE
+ID='AL2'
 ;

diff --git a/localconfig/mysql/alm_Addresses.config b/localconfig/mysql/alm_Addresses.config
index 2564492f20423d2125f367822ce2f0742c986c48..8ab9893cbd70d049333d581e1e506847e5e03606 100644 (file)
--- a/localconfig/mysql/alm_Addresses.config
+++ b/localconfig/mysql/alm_Addresses.config
@@ -1,5 +1,5 @@
 SELECT * FROM
 IoTDeviceAddress
 WHERE
-TYPE='EspAlarmAdd'
+TYPE='DlinkAlarmAdd'
 ;

diff --git a/localconfig/mysql/camSet.config b/localconfig/mysql/camSet.config
index 083ca82d508383ba422b92ece18f86dac7b2b193..9b21ecdb943177138ef51f6b181bed0b204c6009 100644 (file)
--- a/localconfig/mysql/camSet.config
+++ b/localconfig/mysql/camSet.config
@@ -1,3 +1,5 @@
 SELECT * FROM
 CameraSmart
+WHERE
+ID='CM4'
 ;

diff --git a/localconfig/mysql/cameraSet.config b/localconfig/mysql/cameraSet.config
index a061abc4313074cabb0c09aaaadaac1fbbadacaa..4233b236d43a3150edded771570980a70787f964 100644 (file)
--- a/localconfig/mysql/cameraSet.config
+++ b/localconfig/mysql/cameraSet.config
@@ -1,5 +1,5 @@
 SELECT * FROM\r
 CameraSmart\r
 WHERE\r
-ID='CM1'\r
+ID='CM3'\r
 ;\r

diff --git a/others/Mysql/IoTMain.gz b/others/Mysql/IoTMain.gz
index 5f0d373d72f168a9c27649db482df5e1895613da..123e17bec1456172b01cfc21ba41ca320fca69ae 100644 (file)
Binary files a/others/Mysql/IoTMain.gz and b/others/Mysql/IoTMain.gz differ