From 6fbf032d67defcf9f198487761c78dc0db2f8a13 Mon Sep 17 00:00:00 2001
From: Marco Supino <marco@drivenets.com>
Date: Mon, 9 Dec 2024 14:45:58 +0200
Subject: [PATCH 1/2] CDNOS: update version, fix published ports

---
 manifests/controllers/cdnos/manifest.yaml |  2 +-
 topo/node/drivenets/drivenets.go          | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/manifests/controllers/cdnos/manifest.yaml b/manifests/controllers/cdnos/manifest.yaml
index 7ea47bb7..d388a7ec 100644
--- a/manifests/controllers/cdnos/manifest.yaml
+++ b/manifests/controllers/cdnos/manifest.yaml
@@ -576,7 +576,7 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: public.ecr.aws/dn/cdnos-controller:1.7.4
+        image: public.ecr.aws/dn/cdnos-controller:1.7.5
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/topo/node/drivenets/drivenets.go b/topo/node/drivenets/drivenets.go
index a1159dd3..b61c3cae 100644
--- a/topo/node/drivenets/drivenets.go
+++ b/topo/node/drivenets/drivenets.go
@@ -260,18 +260,18 @@ func cdnosDefaults(pb *tpb.Node) *tpb.Node {
 	if pb.Services == nil {
 		pb.Services = map[uint32]*tpb.Service{
 			// https://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=gnmi
-			9339: {
-				Names:  []string{"gnmi", "gnoi", "gnsi"},
+			22: {
+				Names:  []string{"ssh"},
 				Inside: 9339,
 			},
-			9340: {
-				Names:  []string{"gribi"},
-				Inside: 9340,
-			},
 			830: {
 				Names:  []string{"netconf"},
 				Inside: 830,
 			},
+			50051: {
+				Names:  []string{"gnmi"},
+				Inside: 50051,
+			},
 		}
 	}
 	return pb

From 064a0478178f703559a203d14294d869eec2b74b Mon Sep 17 00:00:00 2001
From: Marco Supino <marco@drivenets.com>
Date: Sun, 15 Dec 2024 19:25:09 +0200
Subject: [PATCH 2/2] fix InterfaceCount for mgmt

---
 topo/node/drivenets/drivenets.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/topo/node/drivenets/drivenets.go b/topo/node/drivenets/drivenets.go
index b61c3cae..a04642e5 100644
--- a/topo/node/drivenets/drivenets.go
+++ b/topo/node/drivenets/drivenets.go
@@ -122,7 +122,7 @@ func (n *Node) cdnosCreate(ctx context.Context) error {
 			ConfigFile:     config.ConfigFile,
 			InitImage:      config.InitImage,
 			Ports:          ports,
-			InterfaceCount: len(nodeSpec.Interfaces) + 1,
+			InterfaceCount: len(nodeSpec.Interfaces),
 			InitSleep:      int(config.Sleep),
 			Resources:      node.ToResourceRequirements(nodeSpec.Constraints),
 			Labels:         nodeSpec.Labels,