From 658a0ed1171cc0e88c280b9789b5c304ff2bf9b0 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Tue, 27 Feb 2024 18:24:53 +0700 Subject: [PATCH 1/2] Move vl3-basic test to basic and ipsec suites Signed-off-by: Artem Glazychev --- README.md | 3 +-- examples/basic/README.md | 1 + examples/features/README.md | 1 - examples/ipsec_mechanism/README.md | 1 + .../{features => use-cases}/vl3-basic/.gitignore | 0 .../{features => use-cases}/vl3-basic/README.md | 2 +- .../{features => use-cases}/vl3-basic/client.yaml | 0 .../{features => use-cases}/vl3-basic/diagram.png | Bin .../vl3-basic/kustomization.yaml | 0 .../{features => use-cases}/vl3-basic/netsvc.yaml | 0 .../{features => use-cases}/vl3-basic/ns-vl3.yaml | 0 .../vl3-basic/nse-patch.yaml | 0 12 files changed, 4 insertions(+), 4 deletions(-) rename examples/{features => use-cases}/vl3-basic/.gitignore (100%) rename examples/{features => use-cases}/vl3-basic/README.md (95%) rename examples/{features => use-cases}/vl3-basic/client.yaml (100%) rename examples/{features => use-cases}/vl3-basic/diagram.png (100%) rename examples/{features => use-cases}/vl3-basic/kustomization.yaml (100%) rename examples/{features => use-cases}/vl3-basic/netsvc.yaml (100%) rename examples/{features => use-cases}/vl3-basic/ns-vl3.yaml (100%) rename examples/{features => use-cases}/vl3-basic/nse-patch.yaml (100%) diff --git a/README.md b/README.md index c43a8d919608..f65a1f70d786 100644 --- a/README.md +++ b/README.md @@ -37,8 +37,7 @@ * [Mutually aware nses Example](./examples/features/mutually-aware-nses/) * [vl3 + Topology aware scale from zero Example](./examples/features/vl3-scale-from-zero/) * [Select forwarder Example](./examples/features/select-forwarder/) - * [Exclude prefixes Example](./examples/features/exclude-prefixes/) - * [vl3 Example](./examples/features/vl3-basic/) + * [Exclude prefixes Example](./examples/features/exclude-prefixes/) * [Topology aware scale from zero](./examples/features/scale-from-zero) * [And other features](./examples/features) * [SRIOV examples](./examples/sriov) diff --git a/examples/basic/README.md b/examples/basic/README.md index 60a688c35e7b..7688190499f4 100644 --- a/examples/basic/README.md +++ b/examples/basic/README.md @@ -20,6 +20,7 @@ Contain basic setup for NSM that includes `nsmgr`, `forwarder-vpp`, `registry-k8 - [Memif to IP to Memif Connection](../use-cases/Memif2IP2Memif) - [Kernel to IP to Memif Connection](../use-cases/Kernel2IP2Memif) - [Memif to IP to Kernel Connection](../use-cases/Memif2IP2Kernel) +- [vL3-basic](../use-cases/vl3-basic) ## Run diff --git a/examples/features/README.md b/examples/features/README.md index 915fe844f355..5c4e80804961 100644 --- a/examples/features/README.md +++ b/examples/features/README.md @@ -26,7 +26,6 @@ To run any feature example follow steps for [Basic NSM setup](../basic) - [Select forwarder by capability](./select-forwarder) - [Policy based routing](./policy-based-routing) - [Mutually aware NSEs](./mutually-aware-nses) -- [vL3-basic](./vl3-basic) - [vL3 DNS](./vl3-dns) - [vL3-scale-from-zero](./vl3-scale-from-zero) - [vL3 Load Balancer](./vl3-lb) diff --git a/examples/ipsec_mechanism/README.md b/examples/ipsec_mechanism/README.md index 459cfe8844f0..e056e3aba0c4 100644 --- a/examples/ipsec_mechanism/README.md +++ b/examples/ipsec_mechanism/README.md @@ -14,6 +14,7 @@ Unlike the [basic setup](../basic), which uses `Wireguard` as the default IP rem - [Memif to IP to Memif Connection](../use-cases/Memif2IP2Memif) - [Kernel to IP to Memif Connection](../use-cases/Kernel2IP2Memif) - [Memif to IP to Kernel Connection](../use-cases/Memif2IP2Kernel) +- [vL3-basic](../use-cases/vl3-basic) ## Run diff --git a/examples/features/vl3-basic/.gitignore b/examples/use-cases/vl3-basic/.gitignore similarity index 100% rename from examples/features/vl3-basic/.gitignore rename to examples/use-cases/vl3-basic/.gitignore diff --git a/examples/features/vl3-basic/README.md b/examples/use-cases/vl3-basic/README.md similarity index 95% rename from examples/features/vl3-basic/README.md rename to examples/use-cases/vl3-basic/README.md index 4dac096d69fd..598e9fd463c6 100644 --- a/examples/features/vl3-basic/README.md +++ b/examples/use-cases/vl3-basic/README.md @@ -13,7 +13,7 @@ Diagram: Deploy network service, nsc and vl3 nses (See at `kustomization.yaml`): ```bash -kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/features/vl3-basic?ref=5b5fc446ba5611c7ab5a7b388ed408c2385cd837 +kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/vl3-basic?ref=8ece649611adfc3b7b869a4bba5b8abae2733fff ``` Wait for clients to be ready: diff --git a/examples/features/vl3-basic/client.yaml b/examples/use-cases/vl3-basic/client.yaml similarity index 100% rename from examples/features/vl3-basic/client.yaml rename to examples/use-cases/vl3-basic/client.yaml diff --git a/examples/features/vl3-basic/diagram.png b/examples/use-cases/vl3-basic/diagram.png similarity index 100% rename from examples/features/vl3-basic/diagram.png rename to examples/use-cases/vl3-basic/diagram.png diff --git a/examples/features/vl3-basic/kustomization.yaml b/examples/use-cases/vl3-basic/kustomization.yaml similarity index 100% rename from examples/features/vl3-basic/kustomization.yaml rename to examples/use-cases/vl3-basic/kustomization.yaml diff --git a/examples/features/vl3-basic/netsvc.yaml b/examples/use-cases/vl3-basic/netsvc.yaml similarity index 100% rename from examples/features/vl3-basic/netsvc.yaml rename to examples/use-cases/vl3-basic/netsvc.yaml diff --git a/examples/features/vl3-basic/ns-vl3.yaml b/examples/use-cases/vl3-basic/ns-vl3.yaml similarity index 100% rename from examples/features/vl3-basic/ns-vl3.yaml rename to examples/use-cases/vl3-basic/ns-vl3.yaml diff --git a/examples/features/vl3-basic/nse-patch.yaml b/examples/use-cases/vl3-basic/nse-patch.yaml similarity index 100% rename from examples/features/vl3-basic/nse-patch.yaml rename to examples/use-cases/vl3-basic/nse-patch.yaml From 2a309beb1c99df1ceb922ff89855aef0b8e567d2 Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Tue, 27 Feb 2024 18:51:57 +0700 Subject: [PATCH 2/2] Fix refs Signed-off-by: Artem Glazychev --- examples/use-cases/vl3-basic/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/use-cases/vl3-basic/README.md b/examples/use-cases/vl3-basic/README.md index 598e9fd463c6..6c3869a4079c 100644 --- a/examples/use-cases/vl3-basic/README.md +++ b/examples/use-cases/vl3-basic/README.md @@ -13,7 +13,7 @@ Diagram: Deploy network service, nsc and vl3 nses (See at `kustomization.yaml`): ```bash -kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/vl3-basic?ref=8ece649611adfc3b7b869a4bba5b8abae2733fff +kubectl apply -k https://github.com/networkservicemesh/deployments-k8s/examples/use-cases/vl3-basic?ref=658a0ed1171cc0e88c280b9789b5c304ff2bf9b0 ``` Wait for clients to be ready: