diff --git a/demo_test/functional_test/tests/add_device_to_monitor.expected b/demo_test/functional_test/tests/add_device_to_monitor.expected
new file mode 100644
index 0000000..64812fb
--- /dev/null
+++ b/demo_test/functional_test/tests/add_device_to_monitor.expected
@@ -0,0 +1,18 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+ip1:port1 ip2:port2 attached
+Device ip ip1 already registered
+Device ip ip1 already registered
+invalid command ip1:88
+ip1:port1 ip2:port2 deleted
diff --git a/demo_test/functional_test/tests/add_device_to_monitor.tc b/demo_test/functional_test/tests/add_device_to_monitor.tc
new file mode 100755
index 0000000..4584e81
--- /dev/null
+++ b/demo_test/functional_test/tests/add_device_to_monitor.tc
@@ -0,0 +1,21 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm attach $1:$2:120 $3:$4:100
+./dm attach $1:$2:120
+./dm attach $1:88:120
+./dm attach $1:88
+./dm delete $1:$2 $3:$4
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.expected b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
new file mode 100644
index 0000000..25e732c
--- /dev/null
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.expected
@@ -0,0 +1,18 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+192.168.4.27:8888 attached
+Alert ResourceAdded ResourceRemoved
+192.168.4.27:8888 events cleared
+
+192.168.4.27:8888 deleted
diff --git a/demo_test/functional_test/tests/clear_all_subscribed_events.tc b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
new file mode 100755
index 0000000..f5eef7a
--- /dev/null
+++ b/demo_test/functional_test/tests/clear_all_subscribed_events.tc
@@ -0,0 +1,21 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm attach 192.168.4.27:8888:120
+./dm showdeviceeventlist 192.168.4.27:8888
+./dm cleardeviceeventlist 192.168.4.27:8888
+./dm showdeviceeventlist 192.168.4.27:8888
+./dm delete 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.expected b/demo_test/functional_test/tests/configure_data_polling_interval.expected
new file mode 100644
index 0000000..b3e56c1
--- /dev/null
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.expected
@@ -0,0 +1,18 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+192.168.4.27:8888 attached
+data collection interval configured to 30 seconds
+Invalid interval
+data collection interval configured to 0 seconds
+192.168.4.27:8888 deleted
diff --git a/demo_test/functional_test/tests/configure_data_polling_interval.tc b/demo_test/functional_test/tests/configure_data_polling_interval.tc
new file mode 100755
index 0000000..0939a79
--- /dev/null
+++ b/demo_test/functional_test/tests/configure_data_polling_interval.tc
@@ -0,0 +1,21 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm attach 192.168.4.27:8888:120
+./dm period 192.168.4.27:8888:30
+./dm period 192.168.4.27:8888:3
+./dm period 192.168.4.27:8888:0
+./dm delete 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/delete_monitored_device.expected b/demo_test/functional_test/tests/delete_monitored_device.expected
new file mode 100644
index 0000000..8e1cc31
--- /dev/null
+++ b/demo_test/functional_test/tests/delete_monitored_device.expected
@@ -0,0 +1,16 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+192.168.4.26:8888 192.168.4.27:8888 attached
+192.168.4.26:8888 192.168.4.27:8888 deleted
+Device 192.168.4.27:8888 not found
diff --git a/demo_test/functional_test/tests/delete_monitored_device.tc b/demo_test/functional_test/tests/delete_monitored_device.tc
new file mode 100755
index 0000000..7860e0b
--- /dev/null
+++ b/demo_test/functional_test/tests/delete_monitored_device.tc
@@ -0,0 +1,19 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm attach 192.168.4.27:8888:120 192.168.4.26:8888:100
+./dm delete 192.168.4.27:8888 192.168.4.26:8888
+./dm delete 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/list_device_monitored.expected b/demo_test/functional_test/tests/list_device_monitored.expected
new file mode 100644
index 0000000..2f98be3
--- /dev/null
+++ b/demo_test/functional_test/tests/list_device_monitored.expected
@@ -0,0 +1,17 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+No Device found
+192.168.4.26:8888 192.168.4.27:8888 attached
+192.168.4.26:8888 192.168.4.27:8888
+192.168.4.26:8888 192.168.4.27:8888 deleted
diff --git a/demo_test/functional_test/tests/list_device_monitored.tc b/demo_test/functional_test/tests/list_device_monitored.tc
new file mode 100755
index 0000000..0016968
--- /dev/null
+++ b/demo_test/functional_test/tests/list_device_monitored.tc
@@ -0,0 +1,20 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm showdevices
+./dm attach 192.168.4.26:8888:120 192.168.4.27:8888:100
+./dm showdevices
+./dm delete 192.168.4.26:8888 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/list_subscribed_events.expected b/demo_test/functional_test/tests/list_subscribed_events.expected
new file mode 100644
index 0000000..ad6f141
--- /dev/null
+++ b/demo_test/functional_test/tests/list_subscribed_events.expected
@@ -0,0 +1,17 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Device 192.168.4.26:8888 not registered
+192.168.4.26:8888 attached
+Alert ResourceAdded ResourceRemoved
+192.168.4.26:8888 deleted
diff --git a/demo_test/functional_test/tests/list_subscribed_events.tc b/demo_test/functional_test/tests/list_subscribed_events.tc
new file mode 100755
index 0000000..819aaeb
--- /dev/null
+++ b/demo_test/functional_test/tests/list_subscribed_events.tc
@@ -0,0 +1,20 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm showdeviceeventlist 192.168.4.26:8888
+./dm attach 192.168.4.26:8888:120
+./dm showdeviceeventlist 192.168.4.26:8888
+./dm delete 192.168.4.26:8888
diff --git a/demo_test/functional_test/tests/list_supported_events.expected b/demo_test/functional_test/tests/list_supported_events.expected
new file mode 100644
index 0000000..27a563f
--- /dev/null
+++ b/demo_test/functional_test/tests/list_supported_events.expected
@@ -0,0 +1,17 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Device 192.168.4.27:8888 not registered
+192.168.4.26:8888 attached
+Alert ResourceAdded ResourceRemoved
+192.168.4.26:8888 deleted
diff --git a/demo_test/functional_test/tests/list_supported_events.tc b/demo_test/functional_test/tests/list_supported_events.tc
new file mode 100755
index 0000000..dff2eed
--- /dev/null
+++ b/demo_test/functional_test/tests/list_supported_events.tc
@@ -0,0 +1,20 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm showeventlist 192.168.4.27:8888
+./dm attach 192.168.4.26:8888:120
+./dm showeventlist 192.168.4.26:8888
+./dm delete 192.168.4.26:8888
diff --git a/demo_test/functional_test/tests/subscribe_events.expected b/demo_test/functional_test/tests/subscribe_events.expected
new file mode 100644
index 0000000..73e9325
--- /dev/null
+++ b/demo_test/functional_test/tests/subscribe_events.expected
@@ -0,0 +1,19 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Device 192.168.4.27:8888 not registered
+192.168.4.27:8888 attached
+Alert ResourceAdded ResourceRemoved
+event ResourceAdded already subscribed
+event Update not supported
+192.168.4.27:8888 deleted
diff --git a/demo_test/functional_test/tests/subscribe_events.tc b/demo_test/functional_test/tests/subscribe_events.tc
new file mode 100755
index 0000000..41abd92
--- /dev/null
+++ b/demo_test/functional_test/tests/subscribe_events.tc
@@ -0,0 +1,22 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm sub 192.168.4.27:8888:add
+./dm attach 192.168.4.27:8888:120
+./dm showdeviceeventlist 192.168.4.27:8888
+./dm sub 192.168.4.27:8888:add
+./dm sub 192.168.4.27:8888:update
+./dm delete 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/unsubscribe_events.expected b/demo_test/functional_test/tests/unsubscribe_events.expected
new file mode 100644
index 0000000..eee0d10
--- /dev/null
+++ b/demo_test/functional_test/tests/unsubscribe_events.expected
@@ -0,0 +1,21 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Device 192.168.4.27:8888 not registered
+192.168.4.27:8888 attached
+Alert ResourceAdded ResourceRemoved
+unsub successful
+Alert ResourceRemoved
+event ResourceAdded not found
+event Update not found
+192.168.4.27:8888 deleted
diff --git a/demo_test/functional_test/tests/unsubscribe_events.tc b/demo_test/functional_test/tests/unsubscribe_events.tc
new file mode 100755
index 0000000..df9d440
--- /dev/null
+++ b/demo_test/functional_test/tests/unsubscribe_events.tc
@@ -0,0 +1,24 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm unsub 192.168.4.27:8888:add
+./dm attach 192.168.4.27:8888:120
+./dm showdeviceeventlist 192.168.4.27:8888
+./dm unsub 192.168.4.27:8888:add
+./dm showdeviceeventlist 192.168.4.27:8888
+./dm unsub 192.168.4.27:8888:add
+./dm unsub 192.168.4.27:8888:update
+./dm delete 192.168.4.27:8888
diff --git a/demo_test/functional_test/tests/validate_ip.expected b/demo_test/functional_test/tests/validate_ip.expected
new file mode 100644
index 0000000..ab281ef
--- /dev/null
+++ b/demo_test/functional_test/tests/validate_ip.expected
@@ -0,0 +1,17 @@
+// Copyright 2018 Open Networking Foundation
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+Incorrect IP address format (<ip>:<port #>)
+Invalid IP address 192.168.4
+Port # 8a needs to be an integer
+Device 192.168.4.27:8888 not registered
diff --git a/demo_test/functional_test/tests/validate_ip.tc b/demo_test/functional_test/tests/validate_ip.tc
new file mode 100755
index 0000000..64bdd39
--- /dev/null
+++ b/demo_test/functional_test/tests/validate_ip.tc
@@ -0,0 +1,20 @@
+#!/bin/bash  
+
+# Copyrigh/ 2019-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+./dm showeventlist 192.168.4.27
+./dm showeventlist 192.168.4:8
+./dm showeventlist 192.168.4.27:8a
+./dm showeventlist 192.168.4.27:8888