Merge pull request #166 from canonical/fix-juju-info-network-get

ulterior fix

pyproject.toml

@@ -8,7 +8,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "ops-scenario"
 
-version = "6.1.4"
+version = "6.1.5"
 
 authors = [
     { name = "Pietro Pasotti", email = "[email protected]" }

scenario/consistency_checker.py

@@ -429,7 +429,7 @@ def check_network_consistency(
     meta_bindings = set(charm_spec.meta.get("extra-bindings", ()))
     # add the implicit juju-info binding so we can override its network without
     # having to declare a relation for it in metadata
-    meta_bindings.add("juju-info")
+    implicit_bindings = {"juju-info"}
     all_relations = charm_spec.get_all_relations()
     non_sub_relations = {
         endpoint
@@ -438,7 +438,9 @@ def check_network_consistency(
     }
 
     state_bindings = set(state.networks)
-    if diff := state_bindings.difference(meta_bindings.union(non_sub_relations)):
+    if diff := state_bindings.difference(
+        meta_bindings.union(non_sub_relations).union(implicit_bindings),
+    ):
         errors.append(
             f"Some network bindings defined in State are not in metadata.yaml: {diff}.",
         )

tests/test_e2e/test_network.py

@@ -154,3 +154,20 @@ def test_juju_info_network_override(mycharm):
             str(mgr.charm.model.get_binding("juju-info").network.bind_address)
             == "4.4.4.4"
         )
+
+
+def test_explicit_juju_info_network_override(mycharm):
+    ctx = Context(
+        mycharm,
+        meta={
+            "name": "foo",
+            # this charm for whatever reason explicitly defines a juju-info endpoint
+            "requires": {"juju-info": {"interface": "juju-info"}},
+        },
+    )
+
+    with ctx.manager(
+        "update_status",
+        State(),
+    ) as mgr:
+        assert mgr.charm.model.get_binding("juju-info").network.bind_address