Merge pull request #746 from nokia/refactor-interfaces

Simplify interfaces

Author: karimra

examples/deployments/1.single-instance/1.nats-output/containerlab/gnmic.yaml

@@ -16,7 +16,7 @@ loader:
   type: docker
   filters:
     - containers:
-      - label=clab-node-kind: srl
+      - label=clab-node-kind: nokia_srlinux
         label=containerlab: lab11
 
 subscriptions:

examples/deployments/1.single-instance/11.kafka-kraft-output/containerlab/gnmic.yaml

@@ -0,0 +1,36 @@
+# © 2022 Nokia.
+#
+# This code is a Contribution to the gNMIc project (“Work”) made under the Google Software Grant and Corporate Contributor License Agreement (“CLA”) and governed by the Apache License 2.0.
+# No other rights or licenses in or to any of Nokia’s intellectual property are granted for any other purpose.
+# This code is provided on an “as is” basis without any warranties of any kind.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+username: admin
+password: NokiaSrl1!
+skip-verify: true
+encoding: json_ietf
+log: true
+
+# docker target loader
+loader:
+  type: docker
+  filters:
+    - containers:
+      - label=clab-node-kind: nokia_srlinux
+        label=containerlab: lab12
+
+subscriptions:
+  # Add subscriptions configuration here
+  # e.g:
+  sub1:
+    paths:
+      - /interface/statistics
+    stream-mode: sample
+    sample-interval: 10s
+
+outputs:
+  kafka-output:
+    type: kafka
+    address: clab-lab12-kafka-server:9092
+    topic: telemetry

examples/deployments/1.single-instance/11.kafka-kraft-output/containerlab/kafka.clab.yaml

@@ -0,0 +1,62 @@
+# © 2022 Nokia.
+#
+# This code is a Contribution to the gNMIc project (“Work”) made under the Google Software Grant and Corporate Contributor License Agreement (“CLA”) and governed by the Apache License 2.0.
+# No other rights or licenses in or to any of Nokia’s intellectual property are granted for any other purpose.
+# This code is provided on an “as is” basis without any warranties of any kind.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+name: lab12
+
+topology:
+  defaults:
+    kind: nokia_srlinux
+
+  kinds:
+    nokia_srlinux:
+      image: ghcr.io/nokia/srlinux
+
+  nodes:
+    spine1:
+    spine2:
+    leaf1:
+    leaf2:
+    leaf3:
+    leaf4:
+
+    gnmic:
+      kind: linux
+      image: ghcr.io/openconfig/gnmic:latest
+      binds:
+        - ./gnmic.yaml:/app/gnmic.yaml:ro
+        - /var/run/docker.sock:/var/run/docker.sock
+      cmd: '--config /app/gnmic.yaml --log subscribe'
+
+    kafka-server:
+      kind: linux
+      image: bitnami/kafka:latest
+      ports:
+        - 9092:9092
+        - 9093:9093
+      env:
+        KAFKA_ENABLE_KRAFT: yes
+        ALLOW_PLAINTEXT_LISTENER: yes
+        KAFKA_CFG_NODE_ID: 0
+        KAFKA_CFG_PROCESS_ROLES: broker,controller
+        KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER
+        KAFKA_CFG_LISTENERS: PLAINTEXT://:9092,CONTROLLER://:9093
+        KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT
+        KAFKA_CFG_ADVERTISED_LISTENERS: PLAINTEXT://clab-lab12-kafka-server:9092
+        KAFKA_CFG_CONTROLLER_QUORUM_VOTERS: 0@clab-lab12-kafka-server:9093
+
+  links:
+    # spine1 links
+    - endpoints: ["spine1:e1-1", "leaf1:e1-1"]
+    - endpoints: ["spine1:e1-2", "leaf2:e1-1"]
+    - endpoints: ["spine1:e1-3", "leaf3:e1-1"]
+    - endpoints: ["spine1:e1-4", "leaf4:e1-1"]
+    # spine2 links
+    - endpoints: ["spine2:e1-1", "leaf1:e1-2"]
+    - endpoints: ["spine2:e1-2", "leaf2:e1-2"]
+    - endpoints: ["spine2:e1-3", "leaf3:e1-2"]
+    - endpoints: ["spine2:e1-4", "leaf4:e1-2"]

examples/deployments/1.single-instance/2.kafka-output/containerlab/gnmic.yaml

@@ -17,7 +17,7 @@ loader:
   type: docker
   filters:
     - containers:
-      - label=clab-node-kind: srl
+      - label=clab-node-kind: nokia_srlinux
         label=containerlab: lab12
 
 subscriptions:

examples/deployments/1.single-instance/2.kafka-output/containerlab/kafka.clab.yaml

@@ -62,4 +62,4 @@ topology:
     - endpoints: ["spine2:e1-1", "leaf1:e1-2"]
     - endpoints: ["spine2:e1-2", "leaf2:e1-2"]
     - endpoints: ["spine2:e1-3", "leaf3:e1-2"]
-    - endpoints: ["spine2:e1-4", "leaf4:e1-2"]
+    - endpoints: ["spine2:e1-4", "leaf4:e1-2"]

examples/deployments/1.single-instance/3.influxdb-output/containerlab/gnmic.yaml

@@ -16,7 +16,7 @@ loader:
   type: docker
   filters:
     - containers:
-      - label=clab-node-kind: srl
+      - label=clab-node-kind: nokia_srlinux
         label=containerlab: lab13
 
 subscriptions:

examples/deployments/1.single-instance/4.prometheus-output/containerlab/gnmic.yaml

@@ -15,7 +15,7 @@ loader:
   type: docker
   filters:
     - containers:
-      - label=clab-node-kind: srl
+      - label=clab-node-kind: nokia_srlinux
         label=containerlab: lab14
 
 subscriptions:

examples/deployments/1.single-instance/4.prometheus-output/containerlab/prometheus.clab.yaml

@@ -13,10 +13,10 @@ mgmt:
 
 topology:
   defaults:
-    kind: srl
+    kind: nokia_srlinux
 
   kinds:
-    srl:
+    nokia_srlinux:
       image: ghcr.io/nokia/srlinux
 
   nodes:

examples/deployments/1.single-instance/6.prometheus-write-output/containerlab/gnmic.yaml

@@ -16,7 +16,7 @@ loader:
   type: docker
   filters:
     - containers:
-      - label=clab-node-kind: srl
+      - label=clab-node-kind: nokia_srlinux
         label=containerlab: lab16
 
 subscriptions:

go.mod

@@ -38,7 +38,6 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/nats-io/nats.go v1.38.0
-	github.com/nats-io/stan.go v0.10.4
 	github.com/nsf/termbox-go v1.1.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/openconfig/gnmi v0.11.0
@@ -115,6 +114,7 @@ require (
 	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 // indirect
 	github.com/hairyhenderson/go-fsimpl v0.0.0-20220529183339-9deae3e35047 // indirect
 	github.com/hairyhenderson/yaml v0.0.0-20220618171115-2d35fca545ce // indirect
+	github.com/hashicorp/go-msgpack v1.1.5 // indirect
 	github.com/hashicorp/go-secure-stdlib/mlock v0.1.2 // indirect
 	github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 // indirect
 	github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect
@@ -249,7 +249,6 @@ require (
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mattn/go-tty v0.0.4 // indirect
 	github.com/nats-io/nats-server/v2 v2.10.14 // indirect
-	github.com/nats-io/nats-streaming-server v0.24.6 // indirect
 	github.com/nats-io/nkeys v0.4.9 // indirect
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/openconfig/grpctunnel v0.1.0