Clean up Examples

Author: rlabbeptc

examples/GE EGD exchanges example.py

@@ -10,7 +10,7 @@
 
 
 from kepconfig import connection, error
-from kepconfig.connectivity import channel, device, tag, egd
+from kepconfig.connectivity import channel, egd
 
 # Channel and Device name to be used
 ch_name = 'EGD'

examples/complex-example/Modbus2MQTT_MultiServer.py

@@ -25,7 +25,7 @@
 import csv
 import json
 import kepconfig
-from kepconfig.connectivity import channel, device, tag
+from kepconfig.connectivity import channel, device
 import kepconfig.iot_gateway as IoT
 
 def ErrorHandler(err):

examples/iot gateway example.py

@@ -10,13 +10,12 @@
 
 from kepconfig import connection, error
 from kepconfig.connectivity import channel
-import kepconfig.iot_gateway as IoT
-from kepconfig.iot_gateway import agent, iot_items
+import kepconfig.iot_gateway as iot
 
 # Agent name and Type to be used - constants from kepconfig.iotgateway 
 # can be used to identify the type of agent
 agent_name = 'MQTT Agent 1'
-agent_type = IoT.MQTT_CLIENT_AGENT
+agent_type = iot.MQTT_CLIENT_AGENT
 
 #Tag Address to add to the IoT agent
 iot_item_name = "Channel1.Device1.Tag1"
@@ -100,7 +99,7 @@ def ErrorHandler(err):
 	"iot_gateway.MQTT_CLIENT_PASSWORD": ""
 }
 try:
-    print("{} - {}".format("Add the MQTT Agent", agent.add_iot_agent(server, agent_data, agent_type)))
+    print("{} - {}".format("Add the MQTT Agent", iot.agent.add_iot_agent(server, agent_data, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
@@ -109,20 +108,20 @@ def ErrorHandler(err):
 }
 agent_data['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
 try:
-    print("{} - {}".format("Modify property in the MQTT Agent", agent.modify_iot_agent(server,agent_data, agent_name, agent_type)))
+    print("{} - {}".format("Modify property in the MQTT Agent", iot.agent.modify_iot_agent(server,agent_data, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
 # Get Agent the properties for the agent that was created. It will return the 
 # JSON of the properties
 try:
-    print("{} - {}".format("Read properties of the MQTT Agent", agent.get_iot_agent(server, agent_name, agent_type)))
+    print("{} - {}".format("Read properties of the MQTT Agent", iot.agent.get_iot_agent(server, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
 # Get a list of all MQTT Agents that are configured
 try:
-    print("{} - {}".format("Getting list of MQTT Agents", agent.get_all_iot_agents(server, agent_type)))
+    print("{} - {}".format("Getting list of MQTT Agents", iot.agent.get_all_iot_agents(server, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
@@ -139,7 +138,7 @@ def ErrorHandler(err):
         "iot_gateway.IOT_ITEM_DATA_TYPE": 5 
         }
 try:
-    print("{} - {}".format("Add new tag to the MQTT Agent", iot_items.add_iot_item(server, iot_item_data, agent_name, agent_type)))
+    print("{} - {}".format("Add new tag to the MQTT Agent", iot.iot_items.add_iot_item(server, iot_item_data, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
@@ -150,7 +149,7 @@ def ErrorHandler(err):
         "iot_gateway.IOT_ITEM_SCAN_RATE_MS": 500
 }
 try:
-    print("{} - {}".format("Modify the tag or IoT Item added", iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type)))
+    print("{} - {}".format("Modify the tag or IoT Item added", iot.iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
@@ -162,30 +161,30 @@ def ErrorHandler(err):
         "iot_gateway.IOT_ITEM_SCAN_RATE_MS": 2000
 }
 try:
-    print("{} - {}".format("Modify the tag or IoT Item added again", iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type, iot_item_name, force = True)))
+    print("{} - {}".format("Modify the tag or IoT Item added again", iot.iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type, iot_item_name, force = True)))
 except Exception as err:
     ErrorHandler(err)
 
 # Read the tag or IoT Item configured in the MQTT Agent
 try:
-    print("{} - {}".format("Read the properties of the IoT Item", iot_items.get_iot_item(server, iot_item_name, agent_name, agent_type)))
+    print("{} - {}".format("Read the properties of the IoT Item", iot.iot_items.get_iot_item(server, iot_item_name, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
 # Get a list of all tags or IoT Items configured in the MQTT Agent
 try:
-    print("{} - {}".format("Get a list of all the IoT Items configured in the MQTT Agent", iot_items.get_all_iot_items(server, agent_name, agent_type)))
+    print("{} - {}".format("Get a list of all the IoT Items configured in the MQTT Agent", iot.iot_items.get_all_iot_items(server, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
 # Delete a tag or IoT Item configured in the MQTT Agent
 try:
-    print("{} - {}".format("Delete the IoT Item", iot_items.del_iot_item(server, iot_item_name, agent_name, agent_type)))
+    print("{} - {}".format("Delete the IoT Item", iot.iot_items.del_iot_item(server, iot_item_name, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)
 
 # Delete the MQTT Agent
 try:
-    print("{} - {}".format("Delete the MQTT Agent", agent.del_iot_agent(server, agent_name, agent_type)))
+    print("{} - {}".format("Delete the MQTT Agent", iot.agent.del_iot_agent(server, agent_name, agent_type)))
 except Exception as err:
     ErrorHandler(err)

examples/services and logs example.py

@@ -99,6 +99,11 @@ def ErrorHandler(err):
 except Exception as err:
     ErrorHandler(err)
 
+try:
+    print("{} - {}".format("Here are only the Information entries of the Event Log", json.dumps(server.get_event_log(None, datetime.datetime.fromisoformat('2019-11-03T23:35:23.000'), datetime.datetime.utcnow(), options= {'event': 'Information'}), indent=4)))
+except Exception as err:
+    ErrorHandler(err)
+
 #Get Configuration API Transaction Log
 try:
     print("{} - {}".format("Here is the last API Transaction Log Entry", json.dumps(server.get_transaction_log(1), indent=4)))