many: lessen the use of core-support

We would like to remove core-support but cannot do that at this stage.
As a second best thing prepare snapd for its eventual removal from the
core snap (the plug side).

This patch prepares snapd master for (eventual) removal of the
core-support plug from snapd.

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

tests/main/classic-ubuntu-core-transition-auth/task.yaml

@@ -68,6 +68,3 @@ execute: |
         echo "ubuntu-core still installed, transition failed"
         exit 1
     fi
-
-    echo "Ensure interfaces are connected"
-    snap interfaces -i core-support | MATCH ":core-support.*core:core-support-plug"

tests/main/classic-ubuntu-core-transition-two-cores/task.yaml

@@ -73,6 +73,3 @@ execute: |
         exit 1
     fi
     snap interfaces -i network | MATCH ":network.*test-snapd-python-webserver"
-
-    echo "Ensure interfaces are connected"
-    snap interfaces -i core-support | MATCH ":core-support.*core:core-support-plug"

tests/main/classic-ubuntu-core-transition/task.yaml

@@ -118,9 +118,6 @@ execute: |
     echo "Ensure the webserver is working after a snap restart"
     curl http://localhost | MATCH "XKCD rocks"
 
-    echo "Ensure interfaces are connected"
-    snap interfaces -i core-support | MATCH ":core-support.*core:core-support-plug"
-
     echo "Ensure snap set core works"
     snap set core system.power-key-action=ignore
     if [ "$(snap get core system.power-key-action)" != "ignore" ]; then

tests/main/interfaces-many/task.yaml

@@ -93,13 +93,6 @@ execute: |
         CONNECTED_PATTERN="$slot_iface +$CONSUMER_SNAP"
         DISCONNECTED_PATTERN="$slot_iface +-"
 
-        # The core-support plug is connected by the core snap, so account for
-        # that
-        if [ "$plug_iface" = "$CONSUMER_SNAP:core-support" ]; then
-            CONNECTED_PATTERN="$slot_iface +core:core-support-plug,$CONSUMER_SNAP"
-            DISCONNECTED_PATTERN="$slot_iface +core:core-support-plug$"
-        fi
-
         # Skip any interfaces that core doesn't ship
         if ! snap interfaces | MATCH "$slot_iface +" ; then
             echo "$slot_iface not present, skipping"

tests/main/snap-interface/snap-interface-network.yaml

@@ -0,0 +1,6 @@
+name:    network
+summary: allows access to the network
+plugs:
+  - network-consumer
+slots:
+  - system

tests/main/snap-interface/task.yaml

@@ -2,10 +2,13 @@ summary: Check that "snap interface" works as expected
 details: |
     The "snap interface" command displays a listing of used interfaces
 execute: |
-    snap interface | MATCH 'core-support\s+ special permissions for the core snap'
+    # shellcheck source=tests/lib/snaps.sh
+    . "$TESTSLIB/snaps.sh"
+    install_local network-consumer
+    snap interface | MATCH 'network\s+ allows access to the network'
     snap interface --all | MATCH 'classic-support\s+ special permissions for the classic snap'
-    snap interface core-support > out.yaml
-    diff -u out.yaml snap-interface-core-support.yaml
+    snap interface network > out.yaml
+    diff -u out.yaml snap-interface-network.yaml
 restore: |
     rm -f out.yaml