integrating the portforward command in odo cli

pkg/odo/cli/experimental/debug/debug.go

@@ -2,7 +2,6 @@ package debug
 
 import (
 	"github.com/openshift/odo/pkg/odo/util"
-
 	"github.com/spf13/cobra"
 )
 
@@ -12,14 +11,17 @@ const RecommendedCommandName = "debug"
 var DebugLongDesc = `Debugging related functions`
 
 func NewCmdDebug(name, fullName string) *cobra.Command {
+
+	portforwardCmd := NewCmdPortForward(portforwardCommandName, util.GetFullName(fullName, portforwardCommandName))
+
 	debugCmd := &cobra.Command{
 		Use:     name,
 		Short:   "Debug commands",
 		Long:    DebugLongDesc,
-		Aliases: []string{"e"},
+		Aliases: []string{"d"},
 	}
 
 	debugCmd.SetUsageTemplate(util.CmdUsageTemplate)
-	debugCmd.Annotations = map[string]string{"command": "main"}
+	debugCmd.AddCommand(portforwardCmd)
 	return debugCmd
 }

pkg/odo/cli/experimental/debug/portforward.go

@@ -74,6 +74,7 @@ var (
 const (
 	// Amount of time to wait until at least one pod is running
 	defaultPodPortForwardWaitTimeout = 60 * time.Second
+	portforwardCommandName           = "port-forward"
 )
 
 func NewPortForwardOptions() *PortForwardOptions {
@@ -153,7 +154,7 @@ func NewCmdPortForward(name, fullName string) *cobra.Command {
 
 	opts := NewPortForwardOptions()
 	cmd := &cobra.Command{
-		Use:     name + "port-forward TYPE/NAME [options] [LOCAL_PORT:]REMOTE_PORT [...[LOCAL_PORT_N:]REMOTE_PORT_N]",
+		Use:     name + " [LOCAL_PORT:]REMOTE_PORT [...[LOCAL_PORT_N:]REMOTE_PORT_N]",
 		Short:   "Forward one or more local ports to a pod",
 		Long:    portforwardLong,
 		Example: portforwardExample,

pkg/odo/cli/experimental/experimental.go

@@ -22,8 +22,8 @@ func NewCmdExperimental(name, fullName string) *cobra.Command {
 		Aliases: []string{"e"},
 	}
 
-	experimentalCmd.AddCommand(debugCmd)
 	experimentalCmd.SetUsageTemplate(util.CmdUsageTemplate)
+	experimentalCmd.AddCommand(debugCmd)
 	experimentalCmd.Annotations = map[string]string{"command": "main"}
 	return experimentalCmd
 }