overlord/ifacestate: auto-connect core-support to core-support-plug

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com>

overlord/ifacestate/helpers.go

@@ -105,15 +105,19 @@ func (m *InterfaceManager) addSnaps() error {
 // network-bind slot (on core). This cures the effects of bug
 // https://bugs.launchpad.net/snappy/+bug/1680097
 func (m *InterfaceManager) fixDisconnectedCorePlugs() error {
-	// If the core snap has network-bind-plug
-	if m.repo.Plug("core", "network-bind-plug") != nil {
-		// connect it to the slot (connect is a no-op if connected)
-		connRef := interfaces.ConnRef{
-			PlugRef: interfaces.PlugRef{Snap: "core", Name: "network-bind-plug"},
-			SlotRef: interfaces.SlotRef{Snap: "core", Name: "network-bind"},
-		}
-		if err := m.repo.Connect(connRef); err != nil {
-			logger.Noticef("%s", err)
+	const coreName = "core"
+	for _, slotName := range []string{"network-bind", "core-support"} {
+		plugName := fmt.Sprintf("%s-plug", slotName)
+		// If the core snap has the plug
+		if m.repo.Plug(coreName, plugName) != nil {
+			// connect it to the slot (connect is a no-op if connected)
+			connRef := interfaces.ConnRef{
+				PlugRef: interfaces.PlugRef{Snap: coreName, Name: plugName},
+				SlotRef: interfaces.SlotRef{Snap: coreName, Name: slotName},
+			}
+			if err := m.repo.Connect(connRef); err != nil {
+				logger.Noticef("%s", err)
+			}
 		}
 	}
 	return nil

overlord/ifacestate/ifacestate_test.go

@@ -1893,15 +1893,26 @@ func (s *interfaceManagerSuite) TestManagerFixesNetworkBindConnectionOnInit(c *C
 plugs:
   network-bind-plug:
     interface: network-bind
+  core-support-plug:
+    interface: core-support
 slots:
   network-bind:
+  core-support:
 `)
 	mgr := s.manager(c)
+	// Check that network-bind and core-support are connected to their -plugs
 	connRefs, err := mgr.Repository().Connected("core", "network-bind")
 	c.Assert(err, IsNil)
 	c.Assert(connRefs, HasLen, 1)
 	c.Assert(connRefs, DeepEquals, []interfaces.ConnRef{{
 		PlugRef: interfaces.PlugRef{Snap: "core", Name: "network-bind-plug"},
 		SlotRef: interfaces.SlotRef{Snap: "core", Name: "network-bind"},
 	}})
+	connRefs, err = mgr.Repository().Connected("core", "core-support")
+	c.Assert(err, IsNil)
+	c.Assert(connRefs, HasLen, 1)
+	c.Assert(connRefs, DeepEquals, []interfaces.ConnRef{{
+		PlugRef: interfaces.PlugRef{Snap: "core", Name: "core-support-plug"},
+		SlotRef: interfaces.SlotRef{Snap: "core", Name: "core-support"},
+	}})
 }