Merge branch 'develop' into thesis-mk

nucleus/gnmi_transport.go

@@ -9,8 +9,6 @@ import (
 
 	"code.fbi.h-da.de/danet/gosdn/interfaces/southbound"
 
-	"google.golang.org/grpc"
-
 	ppb "code.fbi.h-da.de/danet/api/go/gosdn/pnd"
 
 	"code.fbi.h-da.de/danet/forks/goarista/gnmi"
@@ -71,10 +69,6 @@ func newGnmiTransport(opts *tpb.TransportOption, sbi southbound.SouthboundInterf
 	}, nil
 }
 
-func parseDialOptions(opts map[string]string) []grpc.DialOption {
-	return nil
-}
-
 // Get takes a slice of gnmi paths, splits them and calls get for each one of them.
 func (g *Gnmi) Get(ctx context.Context, params ...string) (interface{}, error) {
 	if g.client == nil {

nucleus/principalNetworkDomain.go

@@ -341,6 +341,7 @@ func (pnd *pndImplementation) ChangeOND(duid uuid.UUID, operation ppb.ApiOperati
 	return ch.cuid, nil
 }
 
+// nolint will be implemented in the near future
 func handleRollbackError(id uuid.UUID, err error) {
 	log.Error(err)
 	// TODO: Notion of invalid state needed.

nucleus/principalNetworkDomain_test.go

@@ -696,7 +696,6 @@ func Test_pndImplementation_GetDevice(t *testing.T) {
 					t.Errorf("GetDevice() got = %v, want %v", foundDevice.(device.Device).Model(), tt.want)
 				}
 			}
-
 		})
 	}
 }
@@ -747,7 +746,6 @@ func Test_pndImplementation_GetDeviceByName(t *testing.T) {
 					t.Errorf("GetDeviceByName() got = %v, want %v", foundDevice.(device.Device).Model(), tt.want)
 				}
 			}
-
 		})
 	}
 }

nucleus/southbound.go

@@ -114,7 +114,10 @@ func unmarshal(schema *ytypes.Schema, bytes []byte, fields []string, goStruct yg
 		return err
 	}
 	ygot.PruneEmptyBranches(validatedDeepCopy)
-	return ygot.MergeStructInto(goStruct, validatedDeepCopy)
+
+	opts := []ygot.MergeOpt{&ygot.MergeOverwriteExistingFields{}}
+
+	return ygot.MergeStructInto(goStruct, validatedDeepCopy, opts...)
 }
 
 // getField traverses the GoStruct and returns the field that represents the

nucleus/southbound_test.go

@@ -6,8 +6,6 @@ import (
 
 	spb "code.fbi.h-da.de/danet/api/go/gosdn/southbound"
 
-	"code.fbi.h-da.de/danet/gosdn/interfaces/transport"
-
 	"code.fbi.h-da.de/danet/gosdn/nucleus/util/path"
 	"code.fbi.h-da.de/danet/gosdn/nucleus/util/proto"
 	"code.fbi.h-da.de/danet/yang-models/generated/openconfig"
@@ -19,7 +17,6 @@ import (
 
 func TestOpenConfig_Id(t *testing.T) {
 	type fields struct {
-		transport transport.Transport
 		schema *ytypes.Schema
 		id     uuid.UUID
 	}

nucleus/transport.go

@@ -29,7 +29,6 @@ func NewTransport(opts *tpb.TransportOption, sbi southbound.SouthboundInterface)
 		return newGnmiTransport(opts, sbi)
 	default:
 		return nil, &errors.ErrInvalidTransportOptions{Opt: o}
-
 	}
 }
 

nucleus/util/path/traverse.go

@@ -71,7 +71,6 @@ func processEntry(e *yang.Entry) *Element {
 // Strings constructs a slice containg all possible root to leaf paths.
 // Calls stringBuilder internally
 func Strings(paths map[string]*Element) []string {
-	p := make([]string, 0)
 	ch := make(chan string)
 	stop := make(chan bool)
 	val := make(chan []string)
@@ -81,7 +80,8 @@ func Strings(paths map[string]*Element) []string {
 		stringBuilder(ch, &b, v)
 	}
 	stop <- true
-	p = <-val
+	p := <-val
+
 	return p
 }
 
@@ -95,7 +95,6 @@ func appendix(c chan string, stop chan bool, pathChan chan []string) {
 			log.Debug(path)
 		case sig = <-stop:
 			log.Debugf("Signal received: %v", sig)
-
 		}
 		if sig {
 			break

test/containerlab/complex-1.0.clab.tmpl.yml

+# topology documentation: http://containerlab.srlinux.dev/lab-examples/srl-ceos/
+name: @@CLAB_NAME@@
+
+mgmt:
+  network: @@CLAB_NAME@@
+  ipv4_subnet: @@CLAB_MGMT_SUBNET@@
+
+topology:
+  nodes:
+    gosdn:
+      kind: linux
+      image: @@GOSDN_CONTAINER_IMAGE@@
+      ports:
+        - 0:8080
+        - 0:55055
+    ceos1-1:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    ceos1-2:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    ceos2-1-1:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    ceos2-1-2:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    ceos2-2-1:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    ceos2-2-2:
+      kind: ceos
+      image: @@CEOS_CONTAINER_IMAGE@@
+      ports:
+        - 0:6030
+    server3-1-1:
+      kind: linux
+      image: alpine:latest
+    server3-1-2:
+      kind: linux
+      image: alpine:latest
+    server3-1-3:
+      kind: linux
+      image: alpine:latest
+    server3-2-1:
+      kind: linux
+      image: alpine:latest
+    server3-2-2:
+      kind: linux
+      image: alpine:latest
+
+
+  links:
+    - endpoints: ["ceos1-1:eth1", "ceos2-1-1:eth1"]
+    - endpoints: ["ceos1-1:eth2", "ceos2-1-2:eth1"]
+    - endpoints: ["ceos1-1:eth3", "ceos2-2-1:eth1"]
+    - endpoints: ["ceos1-1:eth4", "ceos2-2-2:eth1"]
+    - endpoints: ["ceos1-2:eth1", "ceos2-1-1:eth2"]
+    - endpoints: ["ceos1-2:eth2", "ceos2-1-2:eth2"]
+    - endpoints: ["ceos1-2:eth3", "ceos2-2-1:eth2"]
+    - endpoints: ["ceos1-2:eth4", "ceos2-2-2:eth2"]
+    - endpoints: ["ceos2-1-1:eth3", "server3-1-1:eth1"]
+    - endpoints: ["ceos2-1-1:eth4", "server3-1-2:eth1"]
+    - endpoints: ["ceos2-1-2:eth3", "server3-1-2:eth2"]
+    - endpoints: ["ceos2-1-2:eth4", "server3-1-3:eth1"]
+    - endpoints: ["ceos2-2-1:eth3", "server3-2-1:eth1"]
+    - endpoints: ["ceos2-2-1:eth4", "server3-2-2:eth1"]
+    - endpoints: ["ceos2-2-2:eth3d", "server3-2-1:eth2"]
+    - endpoints: ["ceos2-2-2:eth4", "server3-2-2:eth2"]

test/integration/nucleusIntegration_test.go

@@ -45,10 +45,10 @@ func testSetupIntegration() {
 		log.SetLevel(log.PanicLevel)
 	}
 
-	addr := os.Getenv("GOSDN_TEST_ENDPOINT")
+	addr := os.Getenv("CEOS_TEST_ENDPOINT")
 	if addr != "" {
 		testAddress = addr
-		log.Infof("GOSDN_TEST_ENDPOINT set to %v", testAddress)
+		log.Infof("CEOS_TEST_ENDPOINT set to %v", testAddress)
 	}
 	u := os.Getenv("GOSDN_TEST_USER")
 	if u != "" {