Add more remote vlan examples (#4433)

- The existing suite was broken into two parts:
  - internal
  - vlan breaktrough
- Added OVS-forwarder example
- Added multiple NS example

Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>

apps/nse-remote-vlan/nse-remote-vlan.yaml

@@ -32,7 +32,7 @@ spec:
             - name: NSM_CONNECT_TO
               value: "registry:5002"
             - name: NSM_SERVICES
-              value: "finance-bridge { vlan: 100; via: gw1}"
+              value: "finance-bridge { vlan: 100; via: gw1}, private-bridge { vlan: 200; via: gw1 }"
             - name: NSM_CIDR_PREFIX
               value: "172.10.0.0/24"
             - name: NSM_IPV6_PREFIX

examples/remotevlan/README.md

@@ -1,13 +1,14 @@
 # NSM Remote Vlan Examples
 
-This setup can be used to check remote vlan mechanism. Contain basic setup for NSM that includes `nsmgr`, `registry-k8s`, `admission-webhook-k8s`, `nse-remote-vlan`. The `nse-remote-vlan` belongs to the nsm-system since does not have role in data-plane connection.
+This setup can be used to check remote vlan mechanism with both OVS and VPP forwarder. Contain basic setup for NSM that includes `nsmgr`, `registry-k8s`, `admission-webhook-k8s`, `nse-remote-vlan`. The `nse-remote-vlan` belongs to the nsm-system since does not have role in data-plane connection.
 
 ## Requires
 
 - [spire](../spire)
 
 ## Includes
 
+- [Remote VLAN mechanism using forwarder-ovs](./rvlanovs)
 - [Remote VLAN mechanism using forwarder-vpp](./rvlanvpp)
 
 ## Run

examples/remotevlan/rvlanovs/README.md

@@ -0,0 +1,35 @@
+# NSM Remote Vlan OVS Forwarder
+
+Contains setup for `forwarder-ovs` and device configuration file for remote vlan mechanism.
+
+## Requires
+
+Make sure that you have completed steps from [remotevlan](../../remotevlan) setup.
+
+## Includes
+
+- [Kernel2RVlanInternal](../../use-cases/Kernel2RVlanInternal)
+- [Kernel2RVlanBreakout](../../use-cases/Kernel2RVlanBreakout)
+- [Kernel2RVlanMultiNS](../../use-cases/Kernel2RVlanMultiNS)
+
+## Run
+
+Deploy the forwarder:
+
+```bash
+kubectl apply -k .
+```
+
+Wait forwarder to start:
+
+```bash
+kubectl -n nsm-system wait --for=condition=ready --timeout=2m pod -l app=forwarder-ovs
+```
+
+## Cleanup
+
+Delete the forwarder:
+
+```bash
+kubectl delete -k .
+```

examples/remotevlan/rvlanovs/kustomization.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: nsm-system
+
+bases:
+  - ../../../apps/forwarder-ovs
+
+configMapGenerator:
+  - name: device-selector
+    files:
+      - selector
+
+patchesStrategicMerge:
+  - patch-forwarder-ovs.yaml

examples/remotevlan/rvlanovs/patch-forwarder-ovs.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: forwarder-ovs
+spec:
+  template:
+    spec:
+      containers:
+        - name: forwarder-ovs
+          env:
+            - name: NSM_L2_RESOURCE_SELECTOR_FILE
+              value: /var/lib/networkservicemesh/device-selector.yaml
+          volumeMounts:
+            - name: devsel-vol
+              mountPath: /var/lib/networkservicemesh/device-selector.yaml
+              subPath: device-selector.yaml
+      volumes:
+      - name: devsel-vol
+        configMap:
+          name: device-selector
+          items:
+          - key: selector
+            path: device-selector.yaml

examples/remotevlan/rvlanovs/selector

@@ -0,0 +1,7 @@
+---
+interfaces:
+  - name: eth1
+    bridge: br0
+    matches:
+       - labelSelector:
+           - via: gw1

examples/remotevlan/rvlanvpp/README.md

@@ -8,7 +8,9 @@ Make sure that you have completed steps from [remotevlan](../../remotevlan) setu
 
 ## Includes
 
-- [Kernel2RVlan](../../use-cases/Kernel2RVlan)
+- [Kernel2RVlanInternal](../../use-cases/Kernel2RVlanInternal)
+- [Kernel2RVlanBreakout](../../use-cases/Kernel2RVlanBreakout)
+- [Kernel2RVlanMultiNS](../../use-cases/Kernel2RVlanMultiNS)
 
 ## Run
 
@@ -17,3 +19,17 @@ Deploy the forwarder:
 ```bash
 kubectl apply -k .
 ```
+
+Wait forwarder to start:
+
+```bash
+kubectl -n nsm-system wait --for=condition=ready --timeout=2m pod -l app=forwarder-vpp
+```
+
+## Cleanup
+
+Delete the forwarder:
+
+```bash
+kubectl delete -k .
+```

examples/remotevlan/rvlanvpp/kustomization.yaml

@@ -7,8 +7,9 @@ namespace: nsm-system
 bases:
 - ../../../apps/forwarder-vpp
 
-resources:
-  - device-selector.yaml
-
+configMapGenerator:
+  - name: device-selector
+    files:
+      - selector
 patchesStrategicMerge:
   - patch-forwarder-vpp.yaml

examples/remotevlan/rvlanvpp/selector

@@ -0,0 +1,6 @@
+---
+interfaces:
+  - name: eth1
+    matches:
+       - labelSelector:
+           - via: gw1

examples/use-cases/Kernel2RVlan/README.md → examples/use-cases/Kernel2RVlanBreakout/README.md

@@ -17,7 +17,7 @@ NAMESPACE=($(kubectl create -f https://raw.githubusercontent.com/networkservicem
 NAMESPACE=${NAMESPACE:10}
 ```
 
-Create first iperf server deployment:
+Create iperf server deployment:
 
 ```bash
 cat > first-iperf-s.yaml <<EOF
@@ -58,26 +58,10 @@ spec:
 EOF
 ```
 
-Create kustomization file:
+Deploy the application:
 
 ```bash
-cat > kustomization.yaml <<EOF
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-namespace: ${NAMESPACE}
-
-resources:
-- first-iperf-s.yaml
-
-EOF
-```
-
-Deploy the iperf-NSCs:
-
-```bash
-kubectl apply -k .
+kubectl apply -n ${NAMESPACE} -f ./first-iperf-s.yaml
 ```
 
 Wait for applications ready:
@@ -92,19 +76,6 @@ Get the iperf-NSC pods:
 NSCS=($(kubectl get pods -l app=iperf1-s -n ${NAMESPACE} --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}'))
 ```
 
-Start an iperf server in NSC:
-
-```bash
-IS_FIRST=$(kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- ip a s nsm-1 | grep 172.10.0.1)
-if [ -n "$IS_FIRST" ]; then
-  kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B 172.10.0.1 -1
-  kubectl exec ${NSCS[1]} -c iperf-server -n ${NAMESPACE} -- iperf3 -i0 t 5 -c 172.10.0.1 -B 172.10.0.2
-else
-  kubectl exec ${NSCS[1]} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B 172.10.0.1 -1
-  kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- iperf3 -i0 t 5 -c 172.10.0.1 -B 172.10.0.2
-fi
-```
-
 Create a docker image for test external connections:
 
 ```bash
@@ -131,30 +102,87 @@ docker exec rvm-tester ip addr add 172.10.0.254/24 dev eth0.100
 docker exec rvm-tester ethtool -K eth0 tx off
 ```
 
-Start the client from tester container:
-
-```bash
-docker exec rvm-tester ping -c 1 172.10.0.1
-```
-
 Start iperf client on tester:
 
-```bash
-IS_FIRST=$(kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- ip a s nsm-1 | grep 172.10.0.1)
-if [ -n "$IS_FIRST" ]; then
-  kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B 172.10.0.1 -1
-else
-  kubectl exec ${NSCS[1]} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B 172.10.0.1 -1
-fi
-docker exec rvm-tester iperf3 -i0 t 5 -c 172.10.0.1
-```
+1. TCP
+
+    ```bash
+    status=0
+    for nsc in "${NSCS[@]}"
+    do
+      IP_ADDRESS=$(kubectl exec ${nsc} -c cmd-nsc -n ${NAMESPACE} -- ip -4 addr show nsm-1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+      kubectl exec ${nsc} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B ${IP_ADDRESS} -1
+      docker exec rvm-tester iperf3 -i0 -t 125 -c ${IP_ADDRESS}
+      if test $? -ne 0
+      then
+        status=1
+      fi
+    done
+    if test ${status} -eq 1
+    then
+      false
+    fi
+    ```
+
+2. UDP
+
+    ```bash
+    status=0
+    for nsc in "${NSCS[@]}"
+    do
+      IP_ADDRESS=$(kubectl exec ${nsc} -c cmd-nsc -n ${NAMESPACE} -- ip -4 addr show nsm-1 | grep -oP '(?<=inet\s)\d+(\.\d+){3}')
+      kubectl exec ${nsc} -c iperf-server -n ${NAMESPACE} -- iperf3 -sD -B ${IP_ADDRESS} -1
+      docker exec rvm-tester iperf3 -i0 -t 5 -u -c ${IP_ADDRESS}
+      if test $? -ne 0
+      then
+        status=1
+      fi
+    done
+    if test ${status} -eq 1
+    then
+      false
+    fi
+    ```
 
 Start iperf server on tester:
 
-```bash
-docker exec rvm-tester iperf3 -sD -B 172.10.0.254 -1
-kubectl exec ${NSCS[0]} -c iperf-server -n ${NAMESPACE} -- iperf3 -i0 t 5 -c 172.10.0.254
-```
+1. TCP
+
+    ```bash
+    status=0
+    for nsc in "${NSCS[@]}"
+    do
+      docker exec rvm-tester iperf3 -sD -B 172.10.0.254 -1
+      kubectl exec ${nsc} -c iperf-server -n ${NAMESPACE} -- iperf3 -i0 -t 5 -c 172.10.0.254
+      if test $? -ne 0
+      then
+        status=1
+      fi
+    done
+    if test ${status} -eq 1
+    then
+      false
+    fi
+    ```
+
+2. UDP
+
+    ```bash
+    status=0
+    for nsc in "${NSCS[@]}"
+    do
+      docker exec rvm-tester iperf3 -sD -B 172.10.0.254 -1
+      kubectl exec ${NSCS[1]} -c iperf-server -n ${NAMESPACE} -- iperf3 -i0 -t 5 -u -c 172.10.0.254
+      if test $? -ne 0
+      then
+        status=1
+      fi
+    done
+    if test ${status} -eq 1
+    then
+      false
+    fi
+    ```
 
 ## Cleanup
 

examples/use-cases/Kernel2RVlanInternal/.gitignore

@@ -0,0 +1,2 @@
+first-iperf-s.yaml
+Dockerfile