improvements

- be more tolerant references to cloud.yaml entries
- set mtu automatically if set to 0
- use directly the specified path if a file is specified

Signed-off-by: Marc Schöchlin <[email protected]>

Author: Marc Schöchlin

src/openstack_workload_generator/__main__.py

@@ -47,12 +47,16 @@
                          "adds a ssh proxy jump for the hosts without a floating ip")
 
 parser.add_argument('--clouds_yaml', type=str, nargs="?",
-                    help="Generate a openstack clouds.yaml file")
+                    help="Use a specific clouds.yaml file")
 
 parser.add_argument('--wait_for_machines', action="store_true",
                     help="Wait for every machine to be created "
                          "(normally the provisioning only waits for machines which use floating ips)")
 
+parser.add_argument('--generate_clouds_yaml', type=str, nargs="?",
+                    help="Generate a openstack clouds.yaml file")
+
+
 parser.add_argument('--config', type=str,
                     default="default.yaml",
                     help='The config file for environment creation, define a path to the'
@@ -97,11 +101,14 @@
 
 
 def establish_connection():
-    config = loader.OpenStackConfig()
+    if args.clouds_yaml is None:
+        config = loader.OpenStackConfig()
+    else:
+        LOGGER.info(f"Loading connection configuration from {args.clouds_yaml}")
+        config = loader.OpenStackConfig(config_files=[args.clouds_yaml])
     cloud_config = config.get_one(args.os_cloud)
     return Connection(config=cloud_config)
 
-
 time_start = time.time()
 
 Config.load_config(args.config)
@@ -132,10 +139,10 @@ def establish_connection():
                 elif args.delete_machines:
                     for machine_obj in workload_project.get_machines(args.delete_machines):
                         machine_obj.delete_machine()
-        if args.clouds_yaml:
-            LOGGER.info(f"Creating a a clouds yaml : {args.clouds_yaml}")
+        if args.generate_clouds_yaml:
+            LOGGER.info(f"Creating a a clouds yaml : {args.generate_clouds_yaml}")
             clouds_yaml_data = {"clouds": clouds_yaml_data}
-            with open(args.clouds_yaml, 'w') as file:
+            with open(args.generate_clouds_yaml, 'w') as file:
                 yaml.dump(clouds_yaml_data, file, default_flow_style=False, explicit_start=True)
         sys.exit(0)
     elif args.delete_projects:

src/openstack_workload_generator/entities/helpers.py

@@ -22,11 +22,12 @@ class Config:
             'admin_vm_ssh_keypair_name': 'my_ssh_public_key',
             'project_ipv4_subnet': '192.168.200.0/24',
             'public_network': "public",
-            'network_mtu': '1500',
+            'network_mtu': '0',
             'number_of_floating_ips_per_project': "1",
             'vm_flavor': 'SCS-1L-1',
             'vm_image': 'Ubuntu 24.04',
             'vm_volume_size_gb': "10",
+            'verify_ssl_certificate': "false",
             'cloud_init_extra_script': """#!/bin/bash\necho "HELLO WORLD"; date > READY; whoami >> READY""",
             'wait_for_server_timeout': "300",
         }
@@ -151,6 +152,14 @@ def get_admin_vm_ssh_key() -> str:
     def get_admin_domain_password() -> str:
         return Config.get("admin_domain_password", regex=r".{5,}")
 
+    @staticmethod
+    def get_verify_ssl_certificate() ->bool:
+        value = Config.get("verify_ssl_certificate", regex=r"true|false|True|False")
+        if value.lower() == "false":
+            return False
+        else:
+            return True
+
     @staticmethod
     def configured_quota_names(quota_category: str) -> list[str]:
         if quota_category in Config._config:
@@ -221,7 +230,7 @@ def setup_logging(log_level: str) -> Tuple[logging.Logger, str]:
 
 
 def cloud_checker(value: str) -> str:
-    if not re.fullmatch("[a-zA-Z0-9]+", value):
+    if not re.fullmatch("[a-zA-Z0-9-]+", value):
         raise argparse.ArgumentTypeError('specify a value for os_cloud')
     return value
 

src/openstack_workload_generator/entities/network.py

@@ -112,10 +112,14 @@ def create_and_get_network(self) -> Network:
         if self.obj_network:
             return self.obj_network
 
+        mtu_size = Config.get_network_mtu()
+        if mtu_size == 0:
+            mtu = None
+
         self.obj_network = self.conn.network.create_network(
             name=self.network_name,
             project_id=self.project.id,
-            mtu=Config.get_network_mtu(),
+            mtu=mtu_size,
         )
         if not self.obj_network:
             raise RuntimeError(f"Unable to create network {self.network_name}")

src/openstack_workload_generator/entities/project.py

@@ -305,8 +305,8 @@ def get_clouds_yaml_data(self) -> dict[str, str | dict[str, str]]:
                 "user_domain_name": self.domain.name,
                 "password": self.user.user_password,
             },
+            "verify": Config.get_verify_ssl_certificate(),
             "cacert": self.project_conn.verify,
             "identity_api_version": "3",
-            "endpoint_type": "internalURL"
         }
         return data