Skip to content
Snippets Groups Projects
Commit 5cb3526e authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code cleanup

parent e55b1941
No related branches found
No related tags found
2 merge requests!235Release TeraFlowSDN 3.0,!151Resolve "(TID) New BGP-LS Speaker component"
...@@ -87,7 +87,6 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con ...@@ -87,7 +87,6 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con
'context_uuid': context_uuid, 'context_uuid': context_uuid,
'context_name': context_name, 'context_name': context_name,
'created_at' : now, 'created_at' : now,
'updated_at' : now, 'updated_at' : now,
}] }]
...@@ -97,7 +96,6 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con ...@@ -97,7 +96,6 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con
index_elements=[ContextModel.context_uuid], index_elements=[ContextModel.context_uuid],
set_=dict( set_=dict(
context_name = stmt.excluded.context_name, context_name = stmt.excluded.context_name,
updated_at = stmt.excluded.updated_at, updated_at = stmt.excluded.updated_at,
) )
) )
...@@ -106,6 +104,9 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con ...@@ -106,6 +104,9 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con
return updated_at > created_at return updated_at > created_at
updated = run_transaction(sessionmaker(bind=db_engine), callback) updated = run_transaction(sessionmaker(bind=db_engine), callback)
event_type = EventTypeEnum.EVENTTYPE_UPDATE if updated else EventTypeEnum.EVENTTYPE_CREATE
context_id = json_context_id(context_uuid)
notify_event_context(messagebroker, event_type, context_id)
return ContextId(**context_id) return ContextId(**context_id)
def context_delete(db_engine : Engine, messagebroker : MessageBroker, request : ContextId) -> Empty: def context_delete(db_engine : Engine, messagebroker : MessageBroker, request : ContextId) -> Empty:
......
...@@ -232,7 +232,6 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): ...@@ -232,7 +232,6 @@ class DeviceServiceServicerImpl(DeviceServiceServicer):
device_id = context_client.SetDevice(device) device_id = context_client.SetDevice(device)
device = context_client.GetDevice(device_id) device = context_client.GetDevice(device_id)
if request.device_operational_status != DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_UNDEFINED: if request.device_operational_status != DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_UNDEFINED:
device.device_operational_status = request.device_operational_status device.device_operational_status = request.device_operational_status
......
...@@ -63,14 +63,12 @@ def add(): ...@@ -63,14 +63,12 @@ def add():
for key, _ in DeviceOperationalStatusEnum.DESCRIPTOR.values_by_name.items(): for key, _ in DeviceOperationalStatusEnum.DESCRIPTOR.values_by_name.items():
form.operational_status.choices.append( form.operational_status.choices.append(
(DeviceOperationalStatusEnum.Value(key), key.replace('DEVICEOPERATIONALSTATUS_', ''))) (DeviceOperationalStatusEnum.Value(key), key.replace('DEVICEOPERATIONALSTATUS_', '')))
form.device_type.choices = [] form.device_type.choices = []
# items for Device Type field # items for Device Type field
form.device_type.choices = [] form.device_type.choices = []
for device_type in DeviceTypeEnum: for device_type in DeviceTypeEnum:
if device_type: if device_type:
form.device_type.choices.append((device_type.value,device_type.value)) form.device_type.choices.append((device_type.value,device_type.value))
if form.validate_on_submit(): if form.validate_on_submit():
device_obj = Device() device_obj = Device()
# Device UUID: # Device UUID:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment