added hostname and ip checking

.gitlab/ci/.test.yml

@@ -39,3 +39,9 @@ integration-test-gosdn:
     script:
         - go test -p 1 ./integration-tests/*
     <<: *test
+
+
+unit-test:
+    script:
+        - make unit-test-new
+    <<: *test

Makefile

@@ -106,6 +106,9 @@ integration-tests-debug-up: generate-certs containerize-gosdn containerize-plugi
 integration-tests-debug-down:
 	docker-compose -f dev_env_data/docker-compose/integration-test_docker-compose.yml down
 
+unit-test-new: install-tools
+	go test -p 1 ./cli/...
+
 # Warning: Depending on your go and development configuration might also clean caches, modules and docker containers from your other projects.
 clean:
 	rm -rf $(BUILD_ARTIFACTS_PATH)

cli/cmd/networkElementCreate.go

@@ -49,7 +49,7 @@ if they diverge from the default credentials (user:'admin' and pw:'arista').`,
 
 	Run: func(cmd *cobra.Command, args []string) {
 		spinner, _ := pterm.DefaultSpinner.Start("Creating new network element")
-		err := checkIPPort(address)
+		err := checkIPorHostnameAndPort(address)
 		if err != nil {
 			spinner.Fail(err)
 			return

cli/cmd/utils.go

@@ -41,20 +41,30 @@ import (
 	gpb "github.com/openconfig/gnmi/proto/gnmi"
 	gnmiv "github.com/openconfig/gnmi/value"
 	"github.com/openconfig/goyang/pkg/yang"
+	"golang.org/x/net/idna"
 	"google.golang.org/grpc/metadata"
 )
 
-func checkIPPort(string) error {
+func checkIPorHostnameAndPort(address string) error {
 	// check if address is in the format <IP>:<port>
-	ip, _, err := net.SplitHostPort(address)
-	if err != nil {
-		return err
+	ipOrHostname, _, err := net.SplitHostPort(address)
+	if err != nil || ipOrHostname == "" {
+		errorMessage := fmt.Sprintf("address '%s' is not in the format <IP/Hostname>:<port>", address)
+		return errors.New(errorMessage)
 	}
-	// Check IP
-	ip2 := net.ParseIP(ip)
-	if ip2 == nil {
-		return errors.New("invalid IP")
+
+	// If not IP, check if valid Hostname
+	_, err = idna.Lookup.ToASCII(ipOrHostname)
+	if err != nil {
+		// Check if valid ipIP
+		ip2 := net.ParseIP(ipOrHostname)
+		if ip2 == nil {
+			errorMessage := fmt.Sprintf("address '%s' is neither a valid IP nor a hostname", ipOrHostname)
+			return errors.New(errorMessage)
+
+		}
 	}
+
 	return nil
 }
 

cli/cmd/utils_test.go

+package cmd
+
+import (
+	"testing"
+)
+
+func TestCheckIPorHostnameAndPort(t *testing.T) {
+	// Test cases for valid IP addresses or hostnames with ports
+	validCases := []string{
+		"127.0.0.1:8080",
+		"localhost:8080",
+		"example.com:8080",
+		"[::1]:8080",
+		"[2001:db8::1]:1234",
+	}
+
+	for _, addr := range validCases {
+		err := checkIPorHostnameAndPort(addr)
+		if err != nil {
+			t.Errorf("Expected no error for address %s, but got: %v", addr, err)
+		}
+	}
+}
+
+func TestCheckIPorHostnameAndPortInvalid(t *testing.T) {
+	// Test cases for invalid IP addresses or hostnames with ports
+	invalidCases := []string{
+		":8080",       // Missing IP address or hostname
+		"example.com", // Missing port
+	}
+
+	for _, addr := range invalidCases {
+		err := checkIPorHostnameAndPort(addr)
+		if err == nil {
+			t.Errorf("Expected error for address %s, but got no error", addr)
+		}
+	}
+}