Merge pull request #376 from capocchi/version-5.1

Version 5.1

Author: capocchi

devsimpy/Container.py

@@ -99,6 +99,7 @@
 from Decorators import BuzyCursorNotification, Post_Undo
 from Utilities import HEXToRGB, relpath, playSound, sendEvent, load_and_resize_image, getInstance, FixedList, getObjectFromString, getTopLevelWindow, printOnStatusBar
 from Patterns import Subject, Observer
+from StandaloneGUIKafkaPKG import StandaloneGUIKafkaPKG
 
 if getattr(builtins, 'GUI_FLAG', True):
 	from DetachedFrame import DetachedFrame
@@ -4023,6 +4024,13 @@ def OnExport(self, event):
 									wx.OK | wx.ICON_ERROR)
 				dlg.ShowModal()
 
+	def OnExportKafkaPkg(self, evt):
+		""" Create the standalone package that contains the kafka-based worker for the atomic model
+		"""
+
+		frame = StandaloneGUIKafkaPKG(None, -1, _('Standalone Settings'), block_model=self)
+		frame.Show(True)
+
 	def update(self, concret_subject = None):
 		""" Update method to respond to notify call.
 		"""

devsimpy/DEVSKernel/KAFKADEVS/auto_kafka.py

@@ -73,14 +73,17 @@ def ensure_kafka_broker(
 			# Conteneur existant mais arrêté : on le démarre
 			subprocess.run(["docker", "start", container_name], check=True)
 	else:
+
+		kafka_port = bootstrap.split(':')[-1] or "9092"
+
 		# 3) Sinon, on le crée avec docker run
 		cmd = [
 			"docker", "run", "-d",
 			"--name", container_name,
-			"-p", "9092:9092",
+			"-p", f"{kafka_port}:{kafka_port}",
 			"-e", "KAFKA_NODE_ID=1",
 			"-e", "KAFKA_PROCESS_ROLES=broker,controller",
-			"-e", "KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:9092,CONTROLLER://0.0.0.0:9093",
+			"-e", f"KAFKA_LISTENERS=PLAINTEXT://0.0.0.0:{kafka_port},CONTROLLER://0.0.0.0:9093",
 			"-e", f"KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://{KAFKA_BOOTSTRAP}",
 			"-e", "KAFKA_CONTROLLER_LISTENER_NAMES=CONTROLLER",
 			"-e", "KAFKA_CONTROLLER_QUORUM_VOTERS=1@localhost:9093",

devsimpy/DEVSKernel/Strategies.py

@@ -509,7 +509,7 @@ def simulate(self, T = 1e8):
 				ts = self.ts.Get()
 
 				### The SIM_VERBOSE event occurs
-				PluginManager.trigger_event("SIM_VERBOSE", self.master, None, clock = )
+				PluginManager.trigger_event("SIM_VERBOSE", self.master, None, clock = ts)
 
 				### tree-like data structure ordered by devsimpy priority
 				priority_scheduler = [a for a in formated_priority_list if ts == a[1].myTimeAdvance]