From 3b533952df3419d16355ff087552db17512f27ba Mon Sep 17 00:00:00 2001
From: pwillis7 <p.o.yirenkyi@gmail.com>
Date: Tue, 12 Mar 2024 01:17:34 +0000
Subject: [PATCH] NET-1050: change ingress refs in NMCTL to remote access
 gateways (#2852)

---
 cli/cmd/node/create_ingress.go | 9 +++++----
 cli/cmd/node/delete_ingress.go | 9 +++++----
 cli/cmd/node/list.go           | 2 +-
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/cli/cmd/node/create_ingress.go b/cli/cmd/node/create_ingress.go
index 0e48b591e..e9cf5cc8a 100644
--- a/cli/cmd/node/create_ingress.go
+++ b/cli/cmd/node/create_ingress.go
@@ -6,10 +6,11 @@ import (
 )
 
 var nodeCreateIngressCmd = &cobra.Command{
-	Use:   "create_ingress [NETWORK NAME] [NODE ID]",
-	Args:  cobra.ExactArgs(2),
-	Short: "Turn a Node into a Ingress",
-	Long:  `Turn a Node into a Ingress`,
+	Use:     "create_remote_access_gateway [NETWORK NAME] [NODE ID]",
+	Args:    cobra.ExactArgs(2),
+	Short:   "Turn a Node into a Remote Access Gateway (Ingress)",
+	Long:    `Turn a Node into a Remote Access Gateway (Ingress) for a Network.`,
+	Aliases: []string{"create_rag"},
 	Run: func(cmd *cobra.Command, args []string) {
 		functions.PrettyPrint(functions.CreateIngress(args[0], args[1], failover))
 	},
diff --git a/cli/cmd/node/delete_ingress.go b/cli/cmd/node/delete_ingress.go
index 3afe987d7..6176fdddc 100644
--- a/cli/cmd/node/delete_ingress.go
+++ b/cli/cmd/node/delete_ingress.go
@@ -6,10 +6,11 @@ import (
 )
 
 var nodeDeleteIngressCmd = &cobra.Command{
-	Use:   "delete_ingress [NETWORK NAME] [NODE ID]",
-	Args:  cobra.ExactArgs(2),
-	Short: "Delete Ingress role from a Node",
-	Long:  `Delete Ingress role from a Node`,
+	Use:     "delete_remote_access_gateway [NETWORK NAME] [NODE ID]",
+	Args:    cobra.ExactArgs(2),
+	Short:   "Delete Remote Access Gateway role from a Node",
+	Long:    `Delete Remote Access Gateway role from a Node`,
+	Aliases: []string{"delete_rag"},
 	Run: func(cmd *cobra.Command, args []string) {
 		functions.PrettyPrint(functions.DeleteIngress(args[0], args[1]))
 	},
diff --git a/cli/cmd/node/list.go b/cli/cmd/node/list.go
index 86504d28d..fab49c076 100644
--- a/cli/cmd/node/list.go
+++ b/cli/cmd/node/list.go
@@ -29,7 +29,7 @@ var nodeListCmd = &cobra.Command{
 			functions.PrettyPrint(data)
 		default:
 			table := tablewriter.NewWriter(os.Stdout)
-			table.SetHeader([]string{"ID", "Addresses", "Network", "Egress", "Ingress", "Relay"})
+			table.SetHeader([]string{"ID", "Addresses", "Network", "Egress", "Remote Access Gateway", "Relay"})
 			for _, d := range data {
 				addresses := ""
 				if d.Address != "" {