Skip to content

Commit beb31b5

Browse files
rlabbeptcrlabbeptc
committed
Updated with KepError
1 parent ca16376 commit beb31b5

9 files changed

Lines changed: 131 additions & 122 deletions

‎samples/GE EGD exchanges example.py‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
from kepconfig import connection, error
1313
from kepconfig.connectivity import channel, device, tag, egd
14-
import json
15-
import time
1614

1715
# Channel and Device name to be used
1816
ch_name = 'EGD'
@@ -27,9 +25,11 @@
2725
}]
2826
}
2927

30-
def HTTPErrorHandler(err):
28+
def ErrorHandler(err):
3129
# Generic Handler for exception errors
32-
if err.__class__ is error.KepHTTPError:
30+
if err.__class__ is error.KepError:
31+
print(err.msg)
32+
elif err.__class__ is error.KepHTTPError:
3333
print(err.code)
3434
print(err.msg)
3535
print(err.url)
@@ -50,7 +50,7 @@ def HTTPErrorHandler(err):
5050
try:
5151
print("{} - {}".format("Adding EGD Channel and Device:", channel.add_channel(server,egd_device)))
5252
except Exception as err:
53-
HTTPErrorHandler(err)
53+
ErrorHandler(err)
5454

5555
#####################################################################
5656
# Examples of managing Exchanges and Ranges in the Exchanges
@@ -72,7 +72,7 @@ def HTTPErrorHandler(err):
7272
try:
7373
print("{} - {}".format("Adding Consumer Exchange:", egd.exchange.add_exchange(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE, consumer_exchange)))
7474
except Exception as err:
75-
HTTPErrorHandler(err)
75+
ErrorHandler(err)
7676

7777
producer_exchange = {
7878
"common.ALLTYPES_NAME": "0",
@@ -89,42 +89,42 @@ def HTTPErrorHandler(err):
8989
try:
9090
print("{} - {}".format("Adding Producer Exchange:", egd.exchange.add_exchange(server, ch_name + '.' + dev_name, egd.PRODUCER_EXCHANGE, producer_exchange)))
9191
except Exception as err:
92-
HTTPErrorHandler(err)
92+
ErrorHandler(err)
9393

9494
# Modify an Exchange
9595
try:
9696
print("{} - {}".format("Modify Consumer Exchange:", egd.exchange.modify_exchange(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE,
9797
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2}, consumer_exchange['common.ALLTYPES_NAME'])))
9898
except Exception as err:
99-
HTTPErrorHandler(err)
99+
ErrorHandler(err)
100100

101101
# Get Exchange Properties
102102
try:
103103
print("{} - {}".format("Read Consumer Exchange {}:".format(consumer_exchange['common.ALLTYPES_NAME']),
104104
egd.exchange.get_exchange(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'])))
105105
except Exception as err:
106-
HTTPErrorHandler(err)
106+
ErrorHandler(err)
107107

108108
# Get all Consumer/Producer Exchanges
109109
try:
110110
print("{} - {}".format("Read all Consumer Exchanges:",
111111
egd.exchange.get_exchange(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE)))
112112
except Exception as err:
113-
HTTPErrorHandler(err)
113+
ErrorHandler(err)
114114

115115
# Get all Exchanges
116116
try:
117117
print("{} - {}".format("Read all Exchanges:",
118118
egd.exchange.get_all_exchanges(server, ch_name + '.' + dev_name)))
119119
except Exception as err:
120-
HTTPErrorHandler(err)
120+
ErrorHandler(err)
121121

122122
# Delete Exchange
123123
try:
124124
print("{} - {}".format("Deleting Producer Exchange {}:".format(producer_exchange['common.ALLTYPES_NAME']),
125125
egd.exchange.del_exchange(server, ch_name + '.' + dev_name, egd.PRODUCER_EXCHANGE, producer_exchange['common.ALLTYPES_NAME'])))
126126
except Exception as err:
127-
HTTPErrorHandler(err)
127+
ErrorHandler(err)
128128

129129
# Adding a Range - Multiple ranges can be added by creating a list of ranges
130130
range = {
@@ -141,35 +141,35 @@ def HTTPErrorHandler(err):
141141
print("{} - {}".format("Adding a Range to a Consumer Exchange:", egd.range.add_range(server, ch_name + '.' + dev_name,
142142
egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'], range)))
143143
except Exception as err:
144-
HTTPErrorHandler(err)
144+
ErrorHandler(err)
145145

146146
# Modify a Range
147147
try:
148148
print("{} - {}".format("Modify a Range to a Consumer Exchange:", egd.range.modify_range(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'],
149149
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2}, range['common.ALLTYPES_NAME'])))
150150
except Exception as err:
151-
HTTPErrorHandler(err)
151+
ErrorHandler(err)
152152

153153
# Get a Range for an Exchange
154154
try:
155155
print("{} - {}".format("Read a Range from a Consumer Exchange - {}:".format(range['common.ALLTYPES_NAME']), egd.range.get_range(server, ch_name + '.' + dev_name,
156156
egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'], range['common.ALLTYPES_NAME'])))
157157
except Exception as err:
158-
HTTPErrorHandler(err)
158+
ErrorHandler(err)
159159

160160
# Get all Ranges for an Exchange
161161
try:
162162
print("{} - {}".format("Read all Ranges from a Consumer Exchange:", egd.range.get_range(server, ch_name + '.' + dev_name,
163163
egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'])))
164164
except Exception as err:
165-
HTTPErrorHandler(err)
165+
ErrorHandler(err)
166166

167167
# Delete a Range for an Exchange
168168
try:
169169
print("{} - {}".format("Delete a Range from a Consumer Exchange:", egd.range.del_range(server, ch_name + '.' + dev_name,
170170
egd.CONSUMER_EXCHANGE, consumer_exchange['common.ALLTYPES_NAME'], range['common.ALLTYPES_NAME'])))
171171
except Exception as err:
172-
HTTPErrorHandler(err)
172+
ErrorHandler(err)
173173

174174
#####################################################################
175175
# Examples of managing Name Resolutions
@@ -186,32 +186,32 @@ def HTTPErrorHandler(err):
186186
try:
187187
print("{} - {}".format("Adding Name Resolution:", egd.name.add_name_resolution(server, ch_name + '.' + dev_name, name)))
188188
except Exception as err:
189-
HTTPErrorHandler(err)
189+
ErrorHandler(err)
190190

191191
# Modify a Name Resolution
192192
try:
193193
print("{} - {}".format("Modify Name Resolution {}:".format(name['common.ALLTYPES_NAME']), egd.name.modify_name_resolution(server, ch_name + '.' + dev_name,
194194
{"ge_ethernet_global_data.NAME_RESOLUTION_IP_ADDRESS": '192.168.1.50'}, name['common.ALLTYPES_NAME'])))
195195
except Exception as err:
196-
HTTPErrorHandler(err)
196+
ErrorHandler(err)
197197

198198
# Get Name Resolution Properties
199199
try:
200200
print("{} - {}".format("Read Name Resolution {}:".format(name['common.ALLTYPES_NAME']),
201201
egd.name.get_name_resolution(server, ch_name + '.' + dev_name, name['common.ALLTYPES_NAME'])))
202202
except Exception as err:
203-
HTTPErrorHandler(err)
203+
ErrorHandler(err)
204204

205205
# Get all Name Resolutions
206206
try:
207207
print("{} - {}".format("Read All Name Resolutions:".format(name['common.ALLTYPES_NAME']),
208208
egd.name.get_name_resolution(server, ch_name + '.' + dev_name, name['common.ALLTYPES_NAME'])))
209209
except Exception as err:
210-
HTTPErrorHandler(err)
210+
ErrorHandler(err)
211211

212212
# Delete a Name Resolution
213213
try:
214214
print("{} - {}".format("Delete Name Resolution {}:".format(name['common.ALLTYPES_NAME']),
215215
egd.name.del_name_resolution(server, ch_name + '.' + dev_name, name['common.ALLTYPES_NAME'])))
216216
except Exception as err:
217-
HTTPErrorHandler(err)
217+
ErrorHandler(err)

‎samples/complex-example/Modbus2MQTT_MultiServer.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# -------------------------------------------------------------------------
2-
# Copyright (c) 2020, PTC Inc. and/or all its affiliates. All rights reserved.
2+
# Copyright (c) PTC Inc. and/or all its affiliates. All rights reserved.
33
# See License.txt in the project root for
44
# license information.
55
# --------------------------------------------------------------------------
@@ -28,9 +28,11 @@
2828
from kepconfig.connectivity import channel, device, tag
2929
import kepconfig.iot_gateway as IoT
3030

31-
def HTTPErrorHandler(err):
31+
def ErrorHandler(err):
3232
# Generic Handler for exception errors
33-
if err.__class__ is kepconfig.error.KepHTTPError:
33+
if err.__class__ is kepconfig.error.KepError:
34+
print(err.msg)
35+
elif err.__class__ is kepconfig.error.KepHTTPError:
3436
print(err.code)
3537
print(err.msg)
3638
print(err.url)
@@ -213,9 +215,9 @@ def make_tags(master_list, device, ttag, limit, titem):
213215
try:
214216
print("{} - {}".format("Adding all devices", channel.add_channel(server,all_devices_JSON)))
215217
except Exception as err:
216-
HTTPErrorHandler(err)
218+
ErrorHandler(err)
217219
try:
218220
print("{} - {}".format("Adding all Agents", IoT.agent.add_iot_agent(server,all_agents_JSON,IoT.MQTT_CLIENT_AGENT)))
219221
except Exception as err:
220-
HTTPErrorHandler(err)
222+
ErrorHandler(err)
221223
print ("-- Channel and devices and agent creation completed")

‎samples/complex-example/setup.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,4 @@
66
"channel_name" : "channelModbus",
77
"path" : "csvs/ModbusTags.csv",
88
"Broker_URL" : "tcp://127.0.0.1:1883"
9-
}
10-
9+
}

‎samples/datalogger example.py‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from kepconfig import connection, error
1212
from kepconfig.connectivity import channel
1313
import kepconfig.datalogger as DL
14-
import json
1514

1615
# Log Group to be used with properties that can be configured
1716

@@ -57,9 +56,11 @@
5756
"datalogger.LOG_ITEM_ID": "Channel1.Device1.Tag2"
5857
}
5958

60-
def HTTPErrorHandler(err):
59+
def ErrorHandler(err):
6160
# Generic Handler for exception errors
62-
if err.__class__ is error.KepHTTPError:
61+
if err.__class__ is error.KepError:
62+
print(err.msg)
63+
elif err.__class__ is error.KepHTTPError:
6364
print(err.code)
6465
print(err.msg)
6566
print(err.url)
@@ -114,14 +115,14 @@ def HTTPErrorHandler(err):
114115
try:
115116
print("{} - {}".format("Adding Channel, Device and tags", channel.add_channel(server,channel_data)))
116117
except Exception as err:
117-
HTTPErrorHandler(err)
118+
ErrorHandler(err)
118119

119120

120121
# Add the Datalogger Log Group with the appropriate parameters
121122
try:
122123
print("{} - {}".format("Add the Datalogger Log Group", DL.log_group.add_log_group(server, log_group1)))
123124
except Exception as err:
124-
HTTPErrorHandler(err)
125+
ErrorHandler(err)
125126

126127
# Modify a property of the Log Group If the "common.ALLTYPES_Name" is defined
127128
# the "modify_log_group" function does not need have the log group name as an input
@@ -133,26 +134,26 @@ def HTTPErrorHandler(err):
133134
try:
134135
print("{} - {}".format("Modify property in the Log Group", DL.log_group.modify_log_group(server,log_group_mod_properties,log_group1['common.ALLTYPES_NAME'])))
135136
except Exception as err:
136-
HTTPErrorHandler(err)
137+
ErrorHandler(err)
137138

138139
# Get properties for the log group that was created. It will return the
139140
# JSON of the properties
140141
try:
141142
print("{} - {}".format("Read properties of the Log Group", DL.log_group.get_log_group(server, log_group1['common.ALLTYPES_NAME'])))
142143
except Exception as err:
143-
HTTPErrorHandler(err)
144+
ErrorHandler(err)
144145

145146
# Get a list of all Log Groups that are configured
146147
try:
147148
print("{} - {}".format("Getting list of Log Groups", DL.log_group.get_all_log_groups(server)))
148149
except Exception as err:
149-
HTTPErrorHandler(err)
150+
ErrorHandler(err)
150151

151152
# Add an tag or log item to the to the log group
152153
try:
153154
print("{} - {}".format("Add new tags to the Log Group", DL.log_items.add_log_item(server, log_group1['common.ALLTYPES_NAME'], [log_item1,log_item2])))
154155
except Exception as err:
155-
HTTPErrorHandler(err)
156+
ErrorHandler(err)
156157

157158
# Modify properties of the tag or log item. If the "common.ALLTYPES_Name" is defined
158159
# the "modify_log_item" function does not need have the log item name as an input
@@ -163,7 +164,7 @@ def HTTPErrorHandler(err):
163164
try:
164165
print("{} - {}".format("Modify the tag or Log Item added", DL.log_items.modify_log_item(server, log_group1['common.ALLTYPES_NAME'], modify_log_item)))
165166
except Exception as err:
166-
HTTPErrorHandler(err)
167+
ErrorHandler(err)
167168

168169
# Modify properties of the tag or log Item. (Version 2) It is not necessary to pass JSON
169170
# with the "common.ALLTYPES_Name" of the tag to modify. It can be passed as a input
@@ -175,19 +176,19 @@ def HTTPErrorHandler(err):
175176
try:
176177
print("{} - {}".format("Modify the tag or Log Item added", DL.log_items.modify_log_item(server, log_group1['common.ALLTYPES_NAME'], modify_log_item, log_item1['common.ALLTYPES_NAME'])))
177178
except Exception as err:
178-
HTTPErrorHandler(err)
179+
ErrorHandler(err)
179180

180181
# Read the tag or log Item configured in the Log Group
181182
try:
182183
print("{} - {}".format("Read the properties of the Log Item", DL.log_items.get_log_item(server, log_group1['common.ALLTYPES_NAME'], log_item1['common.ALLTYPES_NAME'])))
183184
except Exception as err:
184-
HTTPErrorHandler(err)
185+
ErrorHandler(err)
185186

186187
# Get a list of all tags or log Items configured in the Log Group
187188
try:
188189
print("{} - {}".format("Get a list of all the Log Items configured in the Log Group", DL.log_items.get_all_log_items(server, log_group1['common.ALLTYPES_NAME'])))
189190
except Exception as err:
190-
HTTPErrorHandler(err)
191+
ErrorHandler(err)
191192

192193
# Setup a trigger in the log group
193194

@@ -201,24 +202,24 @@ def HTTPErrorHandler(err):
201202
try:
202203
print("{} - {}".format("Add new trigger to the Log Group", DL.triggers.add_trigger(server, log_group1['common.ALLTYPES_NAME'],trigger_data)))
203204
except Exception as err:
204-
HTTPErrorHandler(err)
205+
ErrorHandler(err)
205206

206207
# Once configured, enable log group
207208
try:
208209
print("{} - {}".format("Enable the Log Group", DL.log_group.enable_log_group(server, log_group1['common.ALLTYPES_NAME'])))
209210
except Exception as err:
210-
HTTPErrorHandler(err)
211+
ErrorHandler(err)
211212

212213
# Note: Changes cannot be made to the log group while enabled
213214

214215
# Disable log group
215216
try:
216217
print("{} - {}".format("Disable the Log Group", DL.log_group.disable_log_group(server, log_group1['common.ALLTYPES_NAME'])))
217218
except Exception as err:
218-
HTTPErrorHandler(err)
219+
ErrorHandler(err)
219220

220221
# Delete the Log Group
221222
try:
222223
print("{} - {}".format("Delete the Log Group", DL.log_group.del_log_group(server, log_group1['common.ALLTYPES_NAME'])))
223224
except Exception as err:
224-
HTTPErrorHandler(err)
225+
ErrorHandler(err)

0 commit comments

Comments
 (0)