unify parse_storage_constraint or client.Constraints during deploy

juju · Jul 26, 2024 · a3238da · a3238da
1 parent 6c6d70d
commit a3238da
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/juju/model.py b/juju/model.py
@@ -2105,6 +2105,13 @@ async def _deploy(self, charm_url, application, series, config,
 
         app_facade = client.ApplicationFacade.from_connection(self.connection())
 
+        # Prepare all storage constraints
+        storage = storage or dict()
+        storage = {
+            k: v if isinstance(v, client.Constraints) else parse_storage_constraint(v)
+            for k, v in storage.items()
+        }
+
         if server_side_deploy:
             # Call DeployFromRepository
             app = client.DeployFromRepositoryArg(
@@ -2116,7 +2123,7 @@ async def _deploy(self, charm_url, application, series, config,
                 devices=devices,
                 dryrun=False,
                 placement=placement,
-                storage={k: parse_storage_constraint(v) for k, v in (storage or dict()).items()},
+                storage=storage,
                 trust=trust,
                 base=charm_origin.base,
                 channel=channel,
@@ -2151,7 +2158,7 @@ async def _deploy(self, charm_url, application, series, config,
                 endpoint_bindings=endpoint_bindings,
                 num_units=num_units,
                 resources=resources,
-                storage={k: parse_storage_constraint(v) for k, v in (storage or dict()).items()},
+                storage=storage,
                 placement=placement,
                 devices=devices,
                 attach_storage=attach_storage,