Added remote remove

Signed-off-by: Utkarsh Bhatt <[email protected]>

.github/workflows/tests.yml

@@ -657,3 +657,6 @@ jobs:
 
     - name: Verify Remote authentication
       run: ~/actionutils.sh remote_perform_remote_ops_check
+
+    - name: Verify Remote removal
+      run: ~/actionutils.sh remote_remove_and_verify

microceph/client/remote.go

@@ -25,7 +25,20 @@ func SendRemoteImportRequest(ctx context.Context, c *microCli.Client, data types
 	return nil
 }
 
-// SendRemoteImportToClusterMembers Sends the remote import request to every other member of the cluster.
+// SendRemoteRemoveRequest sends the remote remove op to MicroCeph.
+func SendRemoteRemoveRequest(ctx context.Context, c *microCli.Client, remote string) error {
+	queryCtx, cancel := context.WithTimeout(ctx, time.Second*120)
+	defer cancel()
+
+	err := c.Query(queryCtx, "PUT", types.ExtendedPathPrefix, api.NewURL().Path("client", "remotes", remote), nil, nil)
+	if err != nil {
+		return fmt.Errorf("failed to import MicroCeph remote: %w", err)
+	}
+
+	return nil
+}
+
+// Sends the remote import request to every other member of the cluster.
 func SendRemoteImportToClusterMembers(s *state.State, data types.Remote) error {
 	// Get a collection of clients to every other cluster member.
 	cluster, err := s.Cluster(false)

microceph/cmd/microceph/remote.go

@@ -15,11 +15,14 @@ func (c *cmdRemote) Command() *cobra.Command {
 	}
 
 	// Import subcommand
-	remoteImportCmd := cmdRemoteImport{common: c.common, remote: c}
+	remoteImportCmd := cmdRemoteImport{common: c.common}
 	cmd.AddCommand(remoteImportCmd.Command())
 	// List subcommand
-	remoteListCmd := cmdRemoteList{common: c.common, remote: c}
+	remoteListCmd := cmdRemoteList{common: c.common}
 	cmd.AddCommand(remoteListCmd.Command())
+	// Remove subcommand
+	remoteRemoveCmd := cmdRemoteRemove{common: c.common}
+	cmd.AddCommand(remoteRemoveCmd.Command())
 
 	// Workaround for subcommand usage errors. See: https://github.com/spf13/cobra/issues/706
 	cmd.Args = cobra.NoArgs

microceph/cmd/microceph/remote_import.go

@@ -14,7 +14,6 @@ import (
 
 type cmdRemoteImport struct {
 	common    *CmdControl
-	remote    *cmdRemote
 	localName string
 }
 

microceph/cmd/microceph/remote_list.go

@@ -15,7 +15,6 @@ import (
 
 type cmdRemoteList struct {
 	common *CmdControl
-	remote *cmdRemote
 	json   bool
 }
 

microceph/cmd/microceph/remote_remove.go

@@ -0,0 +1,42 @@
+package main
+
+import (
+	"context"
+
+	"github.com/canonical/microceph/microceph/client"
+	"github.com/canonical/microcluster/microcluster"
+	"github.com/spf13/cobra"
+)
+
+type cmdRemoteRemove struct {
+	common *CmdControl
+}
+
+func (c *cmdRemoteRemove) Command() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "remove <Name>",
+		Short: "Remove configured remote",
+		RunE:  c.Run,
+	}
+
+	return cmd
+}
+
+func (c *cmdRemoteRemove) Run(cmd *cobra.Command, args []string) error {
+	if len(args) != 1 {
+		return cmd.Help()
+	}
+
+	m, err := microcluster.App(microcluster.Args{StateDir: c.common.FlagStateDir, Verbose: c.common.FlagLogVerbose, Debug: c.common.FlagLogDebug})
+	if err != nil {
+		return err
+	}
+
+	cli, err := m.LocalClient()
+	if err != nil {
+		return err
+	}
+
+	// send remote remove request
+	return client.SendRemoteRemoveRequest(context.Background(), cli, args[0])
+}

tests/scripts/actionutils.sh

@@ -164,6 +164,18 @@ function remote_perform_remote_ops_check() {
     lxc exec node-wrk3 -- sh -c "microceph remote list --json | grep '\"LocalName\":\"siteb\"'"
 }
 
+function remote_remove_and_verify() {
+    # Remove the configured remote from MicroCeph
+    lxc exec node-wrk0 -- sh -c "microceph remote remove siteb"
+    # Verify list output
+    match=$((lxc exec node-wrk0 -- sh -c "microceph remote list --json | grep '\"Name\":\"siteb\"'") || true )
+    if [[ $match -ne 0 ]] ; then
+        echo "Remote record still present."
+        lxc exec node-wrk0 -- sh -c "microceph remote list --json"
+        exit -1
+    fi
+}
+
 function install_multinode() {
     # Install and setup microceph snap
     for container in node-wrk0 node-wrk1 node-wrk2 node-wrk3 ; do