Skip to content

Commit 6d46c1c

Browse files
rlabbeptcrlabbeptc
committed
Update function calls with optional arg changes
1 parent daad2a4 commit 6d46c1c

8 files changed

Lines changed: 40 additions & 27 deletions

‎examples/GE EGD exchanges example.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ def ErrorHandler(err):
9494
# Modify an Exchange
9595
try:
9696
print("{} - {}".format("Modify Consumer Exchange:", egd.exchange.modify_exchange(server, ch_name + '.' + dev_name, egd.CONSUMER_EXCHANGE,
97-
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2}, consumer_exchange['common.ALLTYPES_NAME'])))
97+
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2},exchange_name= consumer_exchange['common.ALLTYPES_NAME'])))
9898
except Exception as err:
9999
ErrorHandler(err)
100100

‎examples/datalogger example.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def ErrorHandler(err):
132132
"datalogger.LOG_GROUP_UPDATE_RATE_MSEC": 1000
133133
}
134134
try:
135-
print("{} - {}".format("Modify property in the Log Group", DL.log_group.modify_log_group(server,log_group_mod_properties,log_group1['common.ALLTYPES_NAME'])))
135+
print("{} - {}".format("Modify property in the Log Group", DL.log_group.modify_log_group(server,log_group_mod_properties,log_group= log_group1['common.ALLTYPES_NAME'])))
136136
except Exception as err:
137137
ErrorHandler(err)
138138

@@ -174,7 +174,7 @@ def ErrorHandler(err):
174174
"datalogger.LOG_ITEM_NUMERIC_ID": "0"
175175
}
176176
try:
177-
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'])))
177+
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_item= log_item1['common.ALLTYPES_NAME'])))
178178
except Exception as err:
179179
ErrorHandler(err)
180180

‎examples/iot gateway example.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def ErrorHandler(err):
108108
}
109109
agent_data['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
110110
try:
111-
print("{} - {}".format("Modify property in the MQTT Agent", iot.agent.modify_iot_agent(server,agent_data, agent_name, agent_type)))
111+
print("{} - {}".format("Modify property in the MQTT Agent", iot.agent.modify_iot_agent(server,agent_data, agent= agent_name, agent_type= agent_type)))
112112
except Exception as err:
113113
ErrorHandler(err)
114114

@@ -161,7 +161,7 @@ def ErrorHandler(err):
161161
"iot_gateway.IOT_ITEM_SCAN_RATE_MS": 2000
162162
}
163163
try:
164-
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)))
164+
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= iot_item_name, force = True)))
165165
except Exception as err:
166166
ErrorHandler(err)
167167

‎examples/user management example.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def ErrorHandler(err):
109109
}
110110

111111
try:
112-
print("{} - {}".format("Modify User Group properties to prevent 'Writes'",user_groups.modify_user_group(server, modify_group, group1['common.ALLTYPES_NAME'])))
112+
print("{} - {}".format("Modify User Group properties to prevent 'Writes'",user_groups.modify_user_group(server, modify_group, user_group= group1['common.ALLTYPES_NAME'])))
113113
except Exception as err:
114114
ErrorHandler(err)
115115

@@ -140,7 +140,7 @@ def ErrorHandler(err):
140140
}
141141

142142
try:
143-
print("{} - {}".format("Updated a user password", users.modify_user(server,modify_pass, user1['common.ALLTYPES_NAME'])))
143+
print("{} - {}".format("Updated a user password", users.modify_user(server,modify_pass, user= user1['common.ALLTYPES_NAME'])))
144144
except Exception as err:
145145
ErrorHandler(err)
146146

‎tests/admin_test.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ def test_user_groups(server):
147147
# Group 2 fails since it already exists
148148
assert type(admin.user_groups.add_user_group(server,[group2, group3])) == list
149149

150-
assert admin.user_groups.modify_user_group(server,{"libadminsettings.USERMANAGER_GROUP_ENABLED": False},
151-
group1['common.ALLTYPES_NAME'])
150+
assert admin.user_groups.modify_user_group(server,{"libadminsettings.USERMANAGER_GROUP_ENABLED": False},
151+
user_group= group1['common.ALLTYPES_NAME'])
152152

153-
assert admin.user_groups.modify_user_group(server,{"libadminsettings.USERMANAGER_GROUP_ENABLED": True},
154-
group1['common.ALLTYPES_NAME'])
153+
assert admin.user_groups.modify_user_group(server,{"libadminsettings.USERMANAGER_GROUP_ENABLED": True},
154+
user_group= group1['common.ALLTYPES_NAME'])
155155

156156
# Bad Inputs
157157
with pytest.raises(KepError):
@@ -205,7 +205,7 @@ def test_users(server):
205205
# User 2 fails since it already exists
206206
assert type(admin.users.add_user(server,[user2, user3])) == list
207207

208-
assert admin.users.modify_user(server,{"libadminsettings.USERMANAGER_USER_ENABLED": False}, user1['common.ALLTYPES_NAME'])
208+
assert admin.users.modify_user(server,{"libadminsettings.USERMANAGER_USER_ENABLED": False}, user= user1['common.ALLTYPES_NAME'])
209209

210210
# Bad Inputs
211211
with pytest.raises(KepError):

‎tests/datalogger_test.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ def test_log_group_add(server):
198198
assert type(datalogger.log_group.add_log_group(server, [log_group_data2, log_group_data3])) == list
199199

200200
def test_log_group_modify(server):
201-
assert datalogger.log_group.modify_log_group(server, {"datalogger.LOG_GROUP_USE_LOCAL_TIME_FOR_TIMESTAMP_INSERTS": False},log_group_data1['common.ALLTYPES_NAME'], force=True)
201+
assert datalogger.log_group.modify_log_group(server, {"datalogger.LOG_GROUP_USE_LOCAL_TIME_FOR_TIMESTAMP_INSERTS": False}, log_group= log_group_data1['common.ALLTYPES_NAME'], force=True)
202202

203-
assert datalogger.log_group.modify_log_group(server,{"datalogger.LOG_GROUP_USE_LOCAL_TIME_FOR_TIMESTAMP_INSERTS": True},log_group_data1['common.ALLTYPES_NAME'])
203+
assert datalogger.log_group.modify_log_group(server,{"datalogger.LOG_GROUP_USE_LOCAL_TIME_FOR_TIMESTAMP_INSERTS": True},log_group= log_group_data1['common.ALLTYPES_NAME'])
204204

205205
# Fail due to no log_group name provided
206206
with pytest.raises(KepError):
@@ -229,9 +229,9 @@ def test_log_item_add(server):
229229
assert type(datalogger.log_items.add_log_item(server, log_group_name, [log_item2, log_item3])) == list
230230

231231
def test_log_item_modify(server):
232-
assert datalogger.log_items.modify_log_item(server, log_group_name, {"datalogger.LOG_ITEM_NUMERIC_ID": "1"} ,log_item1['common.ALLTYPES_NAME'], force=True)
232+
assert datalogger.log_items.modify_log_item(server, log_group_name, {"datalogger.LOG_ITEM_NUMERIC_ID": "1"} , log_item= log_item1['common.ALLTYPES_NAME'], force=True)
233233

234-
assert datalogger.log_items.modify_log_item(server, log_group_name, {"datalogger.LOG_ITEM_NUMERIC_ID": "0"} ,log_item1['common.ALLTYPES_NAME'])
234+
assert datalogger.log_items.modify_log_item(server, log_group_name, {"datalogger.LOG_ITEM_NUMERIC_ID": "0"} ,log_item= log_item1['common.ALLTYPES_NAME'])
235235

236236
# Fail due to item not identified
237237
with pytest.raises(KepError):
@@ -251,7 +251,7 @@ def test_log_item_get(server):
251251

252252
# Execute mapping test before deleting items
253253
# Modify group to wide format
254-
assert datalogger.log_group.modify_log_group(server, {"datalogger.LOG_GROUP_TABLE_FORMAT": 1}, log_group_name, force=True)
254+
assert datalogger.log_group.modify_log_group(server, {"datalogger.LOG_GROUP_TABLE_FORMAT": 1}, log_group= log_group_name, force=True)
255255

256256
def test_mapping_get(server):
257257
r = datalogger.mapping.get_all_mappings(server, log_group_name)
@@ -268,9 +268,9 @@ def test_mapping_get(server):
268268
def test_mapping_modify(server):
269269
mapping_list = []
270270
mapping_list = datalogger.mapping.get_all_mappings(server, log_group_name)
271-
assert datalogger.mapping.modify_mapping(server, log_group_name, {"datalogger.TABLE_ALIAS_SQL_LENGTH_QUALITY": 10} , mapping_list[0]['common.ALLTYPES_NAME'], force=True)
271+
assert datalogger.mapping.modify_mapping(server, log_group_name, {"datalogger.TABLE_ALIAS_SQL_LENGTH_QUALITY": 10} ,mapping= mapping_list[0]['common.ALLTYPES_NAME'], force=True)
272272

273-
assert datalogger.mapping.modify_mapping(server, log_group_name, {"datalogger.TABLE_ALIAS_SQL_LENGTH_QUALITY": 15} , mapping_list[0]['common.ALLTYPES_NAME'])
273+
assert datalogger.mapping.modify_mapping(server, log_group_name, {"datalogger.TABLE_ALIAS_SQL_LENGTH_QUALITY": 15} ,mapping= mapping_list[0]['common.ALLTYPES_NAME'])
274274

275275
# Fail due to map not identified
276276
with pytest.raises(KepError):
@@ -295,9 +295,9 @@ def test_trigger_add(server):
295295
assert type(datalogger.triggers.add_trigger(server, log_group_name, [trigger2, trigger3])) == list
296296

297297
def test_trigger_modify(server):
298-
assert datalogger.triggers.modify_trigger(server, log_group_name, {"datalogger.TRIGGER_STATIC_INTERVAL": 1000} ,trigger1['common.ALLTYPES_NAME'], force=True)
298+
assert datalogger.triggers.modify_trigger(server, log_group_name, {"datalogger.TRIGGER_STATIC_INTERVAL": 1000} ,trigger= trigger1['common.ALLTYPES_NAME'], force=True)
299299

300-
assert datalogger.triggers.modify_trigger(server, log_group_name, {"datalogger.TRIGGER_STATIC_INTERVAL": 500} ,trigger1['common.ALLTYPES_NAME'])
300+
assert datalogger.triggers.modify_trigger(server, log_group_name, {"datalogger.TRIGGER_STATIC_INTERVAL": 500} ,trigger= trigger1['common.ALLTYPES_NAME'])
301301

302302
# Fail due to trigger not identified
303303
with pytest.raises(KepError):

‎tests/egd_test.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ def get_exchange(server, exchange_type, exchanges):
200200
def modify_exchange(server, exchange_type, exchange_name):
201201

202202
assert kepconfig.connectivity.egd.exchange.modify_exchange(server, ch_name + '.' + dev_name, exchange_type,
203-
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2}, exchange_name)
203+
{"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 2}, exchange_name= exchange_name)
204204
assert kepconfig.connectivity.egd.exchange.modify_exchange(server, ch_name + '.' + dev_name, exchange_type,
205205
{"common.ALLTYPES_NAME": exchange_name,"ge_ethernet_global_data.CONSUMER_EXCHANGE_NUMBER": 3})
206206
assert kepconfig.connectivity.egd.exchange.modify_exchange(server, ch_name + '.' + dev_name, exchange_type,
@@ -240,7 +240,7 @@ def get_range(server, exchange_type, exchange_name, ranges):
240240
def modify_range(server, exchange_type, exchange_name, range_name):
241241

242242
assert kepconfig.connectivity.egd.range.modify_range(server, ch_name + '.' + dev_name, exchange_type, exchange_name,
243-
{"ge_ethernet_global_data.RANGE_HIGH_POINT": 10}, range_name)
243+
{"ge_ethernet_global_data.RANGE_HIGH_POINT": 10}, range_name= range_name)
244244
assert kepconfig.connectivity.egd.range.modify_range(server, ch_name + '.' + dev_name, exchange_type, exchange_name,
245245
{"common.ALLTYPES_NAME": range_name,"ge_ethernet_global_data.RANGE_HIGH_POINT": 11})
246246
assert kepconfig.connectivity.egd.range.modify_range(server, ch_name + '.' + dev_name, exchange_type, exchange_name,
@@ -280,7 +280,7 @@ def get_name(server, names):
280280
def modify_name(server, name):
281281

282282
assert kepconfig.connectivity.egd.name.modify_name_resolution(server, ch_name + '.' + dev_name,
283-
{"ge_ethernet_global_data.NAME_RESOLUTION_IP_ADDRESS": '192.168.1.50'}, name)
283+
{"ge_ethernet_global_data.NAME_RESOLUTION_IP_ADDRESS": '192.168.1.50'}, name= name)
284284
assert kepconfig.connectivity.egd.name.modify_name_resolution(server, ch_name + '.' + dev_name,
285285
{"common.ALLTYPES_NAME": name,"ge_ethernet_global_data.NAME_RESOLUTION_IP_ADDRESS": '192.168.1.100'})
286286
assert kepconfig.connectivity.egd.name.modify_name_resolution(server, ch_name + '.' + dev_name,

‎tests/iot_gateway_test.py‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,26 @@ def test_agent_modify(server):
133133
# Modify Agent
134134
agent = {}
135135
agent['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
136-
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent_name, agent_type)
136+
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent= agent_name, agent_type= agent_type)
137+
138+
# Modify Agent with name and type in data
139+
agent = {}
140+
agent['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
141+
agent['common.ALLTYPES_NAME'] = agent_name
142+
agent['iot_gateway.AGENTTYPES_TYPE'] = agent_type
143+
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent= agent_name, agent_type= agent_type)
137144

138145
# Modify Agent without type (error)
139146
agent = {}
140147
agent['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
141148
with pytest.raises(KepError):
142-
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent_name)
149+
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent= agent_name)
150+
151+
# Modify Agent without name (error)
152+
agent = {}
153+
agent['common.ALLTYPES_DESCRIPTION'] = 'This is the test agent created'
154+
with pytest.raises(KepError):
155+
assert kepconfig.iot_gateway.agent.modify_iot_agent(server,agent, agent_type= agent_type)
143156

144157
def test_agent_get(server):
145158
for agent_name, agent_type in agent_list:
@@ -201,7 +214,7 @@ def test_iot_item_modify(server):
201214
modify_iot_item = {
202215
"iot_gateway.IOT_ITEM_SCAN_RATE_MS": 2000,
203216
}
204-
assert kepconfig.iot_gateway.iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type, iot_item_name, force = True)
217+
assert kepconfig.iot_gateway.iot_items.modify_iot_item(server, modify_iot_item, agent_name, agent_type, iot_item=iot_item_name, force = True)
205218

206219
def test_iot_item_get(server):
207220
for agent_name, agent_type in agent_list:

0 commit comments

Comments
 (0)