Skip to content

Commit 5713a54

Browse files
singha42poorva1209
authored andcommitted
added request
1 parent b022fb9 commit 5713a54

1 file changed

Lines changed: 10 additions & 3 deletions

File tree

gridappsd-field-bus-lib/gridappsd_field_bus/field_interface/field_proxy_forwarder.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def __init__(self, ot_connection: GridAPPSD, proxy_connection: stomp.Connection)
1616
def on_message(self, headers, message):
1717
"Receives messages coming from Proxy bus (e.g. ARTEMIS) and forwards to OT bus"
1818
try:
19-
print(f"Received message at Proxy: {message}")
19+
print(f"Received message at Proxy. destination: {headers['destination']}, message: {headers}")
2020

2121
if headers["destination"] == topics.field_output_topic():
2222
self.ot_connection.send(topics.field_output_topic(), message)
@@ -30,6 +30,11 @@ def on_message(self, headers, message):
3030
if request_type == "get_context":
3131
response = self.ot_connection.get_response(headers["destination"],message)
3232
self.proxy_connection.send(headers["reply_to"],response)
33+
34+
elif 'goss.gridappsd.process.request' in headers["destination"]:
35+
response = self.ot_connection.get_response(headers["destination"],message)
36+
#print(response)
37+
self.proxy_connection.send(headers["reply-to"],json.dumps(response))
3338

3439
else:
3540
print(f"Unrecognized message received by Proxy: {message}")
@@ -52,15 +57,17 @@ def __init__(self, connection_url: str, username: str, password: str):
5257
self.broker_url = connection_url
5358
self.username = username
5459
self.password = password
55-
self.proxy_connection = stomp.Connection([(self.broker_url.split(":")[0], int(self.broker_url.split(":")[1]))],keepalive=True)
60+
self.proxy_connection = stomp.Connection([(self.broker_url.split(":")[0], int(self.broker_url.split(":")[1]))],keepalive=True, heartbeats=(10000,10000))
5661
self.proxy_connection.set_listener('', FieldListener(self.ot_connection, self.proxy_connection))
5762
self.proxy_connection.connect(self.username, self.password, wait=True)
63+
5864
print('Connected to Proxy')
5965

6066

6167

6268
#Subscribe to messages from field
6369
self.proxy_connection.subscribe(destination=topics.BASE_FIELD_TOPIC+'.*', id=1, ack="auto")
70+
self.proxy_connection.subscribe(destination='goss.gridappsd.process.request.data.powergridmodel', id=2, ack="auto")
6471

6572
#Subscribe to messages on OT bus
6673
self.ot_connection.subscribe(topics.field_input_topic(), self.on_message_from_ot)
@@ -71,7 +78,7 @@ def on_message_from_ot(self, headers, message):
7178
print(f"Received message from OT: {message}")
7279

7380
if headers["destination"] == topics.field_input_topic():
74-
self.proxy_connection.send(topics.field_input_topic(), message)
81+
self.proxy_connection.send(topics.field_input_topic(),json.dumps(message))
7582

7683
else:
7784
print(f"Unrecognized message received by OT: {message}")

0 commit comments

Comments
 (0)