Skip to content

resolved issues after testing. calling get context after message bus … #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craig8 merged 1 commit into from
Apr 25, 2023
Merged

resolved issues after testing. calling get context after message bus … #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions gridappsd/field_interface/agents/agents.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,18 @@ def __init__(self,

def connect(self):

if self.agent_area_dict is None:
context = LocalContext.get_context_by_message_bus(
self.downstream_message_bus)
self.agent_area_dict = context['data']

if self.upstream_message_bus is not None:
self.upstream_message_bus.connect()
if self.downstream_message_bus is not None:
self.downstream_message_bus.connect()
if self.downstream_message_bus is None and self.upstream_message_bus is None:
raise ValueError(
"Either upstream or downstream bus must be specified!")

if self.agent_area_dict is None:
context = LocalContext.get_context_by_message_bus(
self.downstream_message_bus)
self.agent_area_dict = context['data']

self.subscribe_to_measurement()
self.subscribe_to_messages()
Expand Down Expand Up @@ -230,11 +230,11 @@ def __init__(self,
downstream_message_bus_def, agent_config,
feeder_dict, simulation_id)

if feeder_dict is not None:
if self.agent_area_dict is not None:
feeder = cim.Feeder(mRID=downstream_message_bus_def.id)
self.feeder_area = DistributedModel(connection=self.connection,
feeder=feeder,
topology=feeder_dict)
topology=self.agent_area_dict)


class SwitchAreaAgent(DistributedAgent):
Expand All @@ -249,10 +249,10 @@ def __init__(self,
super().__init__(upstream_message_bus_def, downstream_message_bus_def,
agent_config, switch_area_dict, simulation_id)

if switch_area_dict is not None:
if self.agent_area_dict is not None:
self.switch_area = SwitchArea(downstream_message_bus_def.id,
self.connection)
self.switch_area.initialize_switch_area(switch_area_dict)
self.switch_area.initialize_switch_area(self.agent_area_dict)


class SecondaryAreaAgent(DistributedAgent):
Expand All @@ -267,10 +267,10 @@ def __init__(self,
super().__init__(upstream_message_bus_def, downstream_message_bus_def,
agent_config, secondary_area_dict, simulation_id)

if secondary_area_dict is not None:
if self.agent_area_dict is not None:
self.secondary_area = SecondaryArea(downstream_message_bus_def.id,
self.connection)
self.secondary_area.initialize_secondary_area(secondary_area_dict)
self.secondary_area.initialize_secondary_area(self.agent_area_dict)


class CoordinatingAgent:
Expand Down
5 changes: 2 additions & 3 deletions gridappsd/field_interface/context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@ def get_context_by_message_bus(cls, downstream_message_bus: FieldMessageBus):

"""
request = {'request_type' : 'get_context',
'downstream_message_bus_id': downstream_message_bus.id,
'agents': True,
'devices': True}
'downstream_message_bus_id': downstream_message_bus.id
}
return downstream_message_bus.get_response(t.context_request_queue(downstream_message_bus.id), request)

@classmethod
Expand Down