fixing vhost, username, password for protocol adapter and clients

Author: marcomelloni

README.md

@@ -155,8 +155,9 @@ simulation_bridge:
 rabbitmq:
   host: localhost # RabbitMQ server hostname or IP
   port: 5672 # RabbitMQ port (default is 5672)
-  virtual_host: / # RabbitMQ virtual host to use
-
+  vhost: / # RabbitMQ virtual host to use
+  username: guest # Username
+  password: guest # Password
   infrastructure:
     exchanges:
       # Define all the exchanges used by the bridge
@@ -214,20 +215,16 @@ mqtt:
   input_topic: bridge/input # Topic to subscribe to for input
   output_topic: bridge/output # Topic to publish results
   qos: 0 # Quality of Service level (0: at most once)
+  username: guest # Username
+  password: guest # Password
 
 # Configuration for REST protocol adapter
 rest:
   host: 0.0.0.0 # Host IP to bind the REST server (0.0.0.0 = all interfaces)
   port: 5000 # Port to run the REST server
-  input_endpoint: /message # Endpoint for receiving messages
+  endpoint: /message # Endpoint for receiving messages
   debug: false # Enable/disable Flask debug mode
 
-  client:
-    host: localhost # REST client target host
-    port: 5001 # Port of the external REST receiver
-    base_url: http://localhost:5001 # Base URL for outgoing REST requests
-    output_endpoint: /result # Path for sending result messages
-
 # Logging configuration
 logging:
   level: INFO # Logging level (DEBUG, INFO, WARNING, ERROR, CRITICAL)
@@ -292,7 +289,7 @@ The developer-specific commands are
 ```bash
 pylint simulation_bridge
 autopep8 --in-place --aggressive --recursive 'simulation_bridge'
-pytest --cov=simulation_bridge --cov-report=term --cov-report=html simulation_bridge/test/unit/
+pytest --cov=simulation_bridge --cov-report=term --cov-report=html simulation_bridge/test/
 open htmlcov/index.html
 ```
 

poetry.lock

@@ -39,6 +39,7 @@ mypy = "^1.15.0"
 pytest = "^8.3.5"
 pytest-asyncio = "^1.0.0"
 types-pyyaml = "^6.0.12.20250402"
+pytest-cov = "^6.1.1"
 
 [build-system]
 requires = ["poetry-core>=2.0.0,<3.0.0"]

pyproject.toml

@@ -4,9 +4,10 @@ simulation_bridge:
 rabbitmq:
   host: localhost
   port: 5672
-  virtual_host: /
+  vhost: /
   username: guest
   password: guest
+
   infrastructure:
     exchanges:
       - name: ex.input.bridge

simulation_bridge/config/config.yaml.template

@@ -42,6 +42,10 @@ def __init__(self, config):
         self.config = config['mqtt']
         self.payload_file = config.get('payload_file', 'simulation.yaml')
         self.client = mqtt.Client()
+        self.client.username_pw_set(
+            self.config['username'],
+            self.config['password']
+        )
         self.client.on_message = self.on_message
 
     def on_message(self, client, userdata, msg):  # pylint: disable=unused-argument

simulation_bridge/resources/mqtt/mqtt_client.py

@@ -28,9 +28,20 @@ def __init__(self, config):
         """Initialize the Digital Twin with the given configuration."""
         self.config = config
         self.dt_id = config['digital_twin']['dt_id']
-        self.connection = pika.BlockingConnection(
-            pika.ConnectionParameters(config['rabbitmq_host'])
+
+        rabbitmq_cfg = config['rabbitmq']
+        credentials = pika.PlainCredentials(
+            username=rabbitmq_cfg['username'],
+            password=rabbitmq_cfg['password']
+        )
+        parameters = pika.ConnectionParameters(
+            host=rabbitmq_cfg['host'],
+            port=rabbitmq_cfg.get('port', 5672),
+            virtual_host=rabbitmq_cfg.get('vhost', '/'),
+            credentials=credentials
         )
+
+        self.connection = pika.BlockingConnection(parameters)
         self.channel = self.connection.channel()
         self.result_queue_name = None
         self.setup_infrastructure()

simulation_bridge/resources/rabbitmq/rabbitmq_client.py

@@ -77,7 +77,7 @@ def _initialize_rabbitmq_connection(self):
                 pika.ConnectionParameters(
                     host=self.config['host'],
                     port=self.config['port'],
-                    virtual_host=self.config['virtual_host'],
+                    virtual_host=self.config['vhost'],
                     credentials=credentials,
                     heartbeat=RABBITMQ_HEARTBEAT,
                     blocked_connection_timeout=RABBITMQ_BLOCKED_CONNECTION_TIMEOUT,

simulation_bridge/src/core/bridge_core.py

@@ -30,7 +30,7 @@ def __init__(self, config_manager: ConfigManager):
             pika.ConnectionParameters(
                 host=self.config['host'],
                 port=self.config['port'],
-                virtual_host=self.config['virtual_host'],
+                virtual_host=self.config['vhost'],
                 credentials=credentials
             )
         )
@@ -52,12 +52,18 @@ def setup(self):
 
     def reconnect(self):
         """Reconnect to RabbitMQ if connection was closed."""
+
         if self.connection.is_closed:
+            credentials = pika.PlainCredentials(
+                self.config['username'],
+                self.config['password']
+            )
             self.connection = pika.BlockingConnection(
                 pika.ConnectionParameters(
                     host=self.config['host'],
                     port=self.config['port'],
-                    virtual_host=self.config['virtual_host']
+                    virtual_host=self.config['vhost'],
+                    credentials=credentials
                 )
             )
             self.channel = self.connection.channel()

simulation_bridge/src/core/bridge_infrastructure.py

@@ -46,7 +46,7 @@ def __init__(self, config_manager: ConfigManager):
             pika.ConnectionParameters(
                 host=self.config['host'],
                 port=self.config['port'],
-                virtual_host=self.config['virtual_host'],
+                virtual_host=self.config['vhost'],
                 credentials=credentials
             )
         )

simulation_bridge/src/protocol_adapters/rabbitmq/rabbitmq_adapter.py

@@ -59,7 +59,7 @@ class RabbitMQConfig(BaseModel):
     """Configuration for RabbitMQ connection."""
     host: str
     port: int
-    virtual_host: str
+    vhost: str
     username: str
     password: str
     infrastructure: RabbitMQInfrastructure
@@ -146,7 +146,7 @@ def from_dict(cls, config_dict: Dict[str, Any]) -> 'Config':
         rabbit_config = RabbitMQConfig(
             host=rabbitmq_dict.get('host', 'localhost'),
             port=rabbitmq_dict.get('port', 5672),
-            virtual_host=rabbitmq_dict.get('virtual_host', '/'),
+            vhost=rabbitmq_dict.get('vhost', '/'),
             username=rabbitmq_dict.get('username', 'guest'),
             password=rabbitmq_dict.get('password', 'guest'),
             infrastructure=infrastructure
@@ -217,7 +217,7 @@ def get_default_config(self) -> Dict[str, Any]:
             rabbitmq=RabbitMQConfig(
                 host="localhost",
                 port=5672,
-                virtual_host="/",
+                vhost="/",
                 username="guest",
                 password="guest",
                 infrastructure=RabbitMQInfrastructure(