From e4b9c4fc5dfd499ecee9ef313f63be91f2d2dbd3 Mon Sep 17 00:00:00 2001 From: Alex de Cock Buning <100383348@alumnos.uc3m.es> Date: Wed, 2 Oct 2024 05:22:52 +0200 Subject: [PATCH] mod package: renamed package to match girhub repository --- PROJECT | 8 +- cmd/main.go | 4 +- cover.out | 272 +++++++++--------- go.mod | 2 +- internal/controller/l2network_controller.go | 6 +- .../controller/l2network_controller_test.go | 2 +- .../networkedgedevice_controller.go | 4 +- .../networkedgedevice_controller_test.go | 2 +- internal/controller/overlay_controller.go | 4 +- .../controller/overlay_controller_test.go | 2 +- internal/controller/pod_controller.go | 8 +- internal/controller/pod_utils.go | 2 +- internal/controller/suite_test.go | 2 +- internal/nedinterface/nedinterface.go | 2 +- internal/sdnclient/client.go | 2 +- internal/sdnclient/external_client.go | 2 +- internal/sdnclient/internal_client.go | 2 +- test/e2e/e2e_test.go | 2 +- 18 files changed, 164 insertions(+), 164 deletions(-) diff --git a/PROJECT b/PROJECT index 48e9004..4c76654 100644 --- a/PROJECT +++ b/PROJECT @@ -6,7 +6,7 @@ domain: l2sm.k8s.local layout: - go.kubebuilder.io/v4 projectName: controllermanager -repo: l2sm.k8s.local/controllermanager +repo: github.com/Networks-it-uc3m/L2S-M resources: - api: crdVersion: v1 @@ -15,7 +15,7 @@ resources: domain: l2sm.k8s.local group: l2sm kind: L2Network - path: l2sm.k8s.local/controllermanager/api/v1 + path: github.com/Networks-it-uc3m/L2S-M/api/v1 version: v1 - controller: true group: core @@ -29,7 +29,7 @@ resources: domain: l2sm.k8s.local group: l2sm kind: NetworkEdgeDevice - path: l2sm.k8s.local/controllermanager/api/v1 + path: github.com/Networks-it-uc3m/L2S-M/api/v1 version: v1 - api: crdVersion: v1 @@ -38,7 +38,7 @@ resources: domain: l2sm.k8s.local group: l2sm kind: Overlay - path: l2sm.k8s.local/controllermanager/api/v1 + path: github.com/Networks-it-uc3m/L2S-M/api/v1 version: v1 webhooks: defaulting: true diff --git a/cmd/main.go b/cmd/main.go index 8adf4af..1d9f621 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -25,11 +25,11 @@ import ( // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" + "github.com/Networks-it-uc3m/L2S-M/internal/controller" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" - "l2sm.k8s.local/controllermanager/internal/controller" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" diff --git a/cover.out b/cover.out index 42a405b..362942e 100644 --- a/cover.out +++ b/cover.out @@ -1,137 +1,137 @@ mode: set -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:59.101,68.16 4 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:68.16,71.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:74.2,74.43 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:74.43,75.91 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:75.91,77.90 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:77.90,81.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:84.4,85.49 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:85.49,87.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:91.3,91.28 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:95.2,95.91 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:95.91,97.48 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:97.48,99.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:102.2,102.52 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:102.52,104.17 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:104.17,106.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:107.3,110.81 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:110.81,113.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:116.2,117.16 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:117.16,124.3 3 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:126.2,126.13 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:126.13,128.17 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:128.17,133.4 3 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:134.3,134.75 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:135.8,137.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:138.2,138.108 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:138.108,141.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:143.2,143.27 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:147.72,156.16 6 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:156.16,159.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:160.2,162.14 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:165.106,167.34 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:167.34,169.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:170.2,174.16 3 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:174.16,176.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:178.2,179.16 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:179.16,183.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:185.2,185.13 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:185.13,187.17 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:187.17,190.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:191.3,191.80 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:192.8,194.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:195.2,195.33 1 0 -l2sm.k8s.local/controllermanager/internal/controller/l2network_controller.go:199.142,205.2 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:63.109,69.70 3 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:69.70,74.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:77.2,80.57 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:80.57,84.70 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:84.70,86.55 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:86.55,88.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:89.4,89.84 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:92.8,94.69 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:94.69,96.72 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:96.72,100.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:103.4,104.55 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:104.55,106.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:109.3,111.28 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:114.2,115.144 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:115.144,118.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:120.2,120.39 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:120.39,121.71 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:121.71,124.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:125.3,126.58 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:127.9,131.3 0 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:133.2,133.27 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:137.80,138.145 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:138.145,142.19 3 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:142.19,144.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:146.3,146.72 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:146.72,148.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:151.3,151.30 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:152.17,154.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:155.2,158.14 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:161.131,164.2 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:165.131,168.16 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:168.16,170.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:174.2,174.103 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:174.103,185.99 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:185.99,187.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:188.3,188.24 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:191.2,194.56 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:194.56,196.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:198.2,198.105 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:198.105,212.79 4 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:212.79,215.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:218.3,267.67 3 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:267.67,269.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:270.3,270.62 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:270.62,272.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:273.3,273.100 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:273.100,275.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:276.3,276.25 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:279.2,280.16 2 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:280.16,282.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:284.2,284.56 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:284.56,286.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/networkedgedevice_controller.go:288.2,288.12 1 0 -l2sm.k8s.local/controllermanager/internal/controller/overlay_controller.go:49.99,55.2 2 0 -l2sm.k8s.local/controllermanager/internal/controller/overlay_controller.go:58.70,62.2 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:36.94,42.16 4 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:42.16,45.3 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:49.2,49.55 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:49.55,54.17 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:54.17,57.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:59.3,59.77 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:59.77,63.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:67.3,72.47 3 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:72.47,75.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:79.3,79.40 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:79.40,84.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:86.3,92.17 4 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:92.17,95.4 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:96.3,96.70 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:99.2,99.57 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:103.66,106.2 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:108.82,112.16 3 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:112.16,115.30 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:115.30,117.18 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:117.18,119.5 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:124.2,124.26 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:124.26,125.39 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:125.39,128.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:129.3,129.36 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:132.2,132.35 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:135.114,138.55 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:138.55,140.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:143.2,144.43 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:144.43,146.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:149.2,149.31 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:149.31,150.55 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:150.55,152.4 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:155.2,155.18 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:158.124,170.2 7 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:172.57,187.2 5 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:188.77,190.16 2 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:190.16,192.3 1 0 -l2sm.k8s.local/controllermanager/internal/controller/pod_webhook.go:193.2,193.25 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:59.101,68.16 4 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:68.16,71.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:74.2,74.43 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:74.43,75.91 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:75.91,77.90 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:77.90,81.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:84.4,85.49 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:85.49,87.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:91.3,91.28 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:95.2,95.91 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:95.91,97.48 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:97.48,99.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:102.2,102.52 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:102.52,104.17 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:104.17,106.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:107.3,110.81 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:110.81,113.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:116.2,117.16 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:117.16,124.3 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:126.2,126.13 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:126.13,128.17 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:128.17,133.4 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:134.3,134.75 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:135.8,137.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:138.2,138.108 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:138.108,141.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:143.2,143.27 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:147.72,156.16 6 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:156.16,159.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:160.2,162.14 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:165.106,167.34 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:167.34,169.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:170.2,174.16 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:174.16,176.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:178.2,179.16 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:179.16,183.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:185.2,185.13 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:185.13,187.17 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:187.17,190.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:191.3,191.80 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:192.8,194.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:195.2,195.33 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/l2network_controller.go:199.142,205.2 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:63.109,69.70 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:69.70,74.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:77.2,80.57 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:80.57,84.70 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:84.70,86.55 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:86.55,88.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:89.4,89.84 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:92.8,94.69 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:94.69,96.72 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:96.72,100.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:103.4,104.55 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:104.55,106.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:109.3,111.28 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:114.2,115.144 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:115.144,118.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:120.2,120.39 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:120.39,121.71 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:121.71,124.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:125.3,126.58 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:127.9,131.3 0 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:133.2,133.27 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:137.80,138.145 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:138.145,142.19 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:142.19,144.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:146.3,146.72 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:146.72,148.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:151.3,151.30 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:152.17,154.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:155.2,158.14 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:161.131,164.2 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:165.131,168.16 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:168.16,170.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:174.2,174.103 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:174.103,185.99 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:185.99,187.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:188.3,188.24 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:191.2,194.56 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:194.56,196.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:198.2,198.105 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:198.105,212.79 4 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:212.79,215.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:218.3,267.67 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:267.67,269.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:270.3,270.62 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:270.62,272.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:273.3,273.100 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:273.100,275.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:276.3,276.25 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:279.2,280.16 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:280.16,282.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:284.2,284.56 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:284.56,286.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/networkedgedevice_controller.go:288.2,288.12 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/overlay_controller.go:49.99,55.2 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/overlay_controller.go:58.70,62.2 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:36.94,42.16 4 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:42.16,45.3 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:49.2,49.55 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:49.55,54.17 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:54.17,57.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:59.3,59.77 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:59.77,63.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:67.3,72.47 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:72.47,75.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:79.3,79.40 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:79.40,84.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:86.3,92.17 4 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:92.17,95.4 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:96.3,96.70 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:99.2,99.57 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:103.66,106.2 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:108.82,112.16 3 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:112.16,115.30 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:115.30,117.18 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:117.18,119.5 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:124.2,124.26 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:124.26,125.39 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:125.39,128.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:129.3,129.36 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:132.2,132.35 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:135.114,138.55 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:138.55,140.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:143.2,144.43 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:144.43,146.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:149.2,149.31 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:149.31,150.55 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:150.55,152.4 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:155.2,155.18 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:158.124,170.2 7 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:172.57,187.2 5 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:188.77,190.16 2 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:190.16,192.3 1 0 +github.com/Networks-it-uc3m/L2S-M/internal/controller/pod_webhook.go:193.2,193.25 1 0 diff --git a/go.mod b/go.mod index e37b747..f2b4996 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module l2sm.k8s.local/controllermanager +module github.com/Networks-it-uc3m/L2S-M go 1.21.7 diff --git a/internal/controller/l2network_controller.go b/internal/controller/l2network_controller.go index ce7411e..20716e2 100644 --- a/internal/controller/l2network_controller.go +++ b/internal/controller/l2network_controller.go @@ -28,9 +28,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" - "l2sm.k8s.local/controllermanager/internal/sdnclient" - "l2sm.k8s.local/controllermanager/internal/utils" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" + "github.com/Networks-it-uc3m/L2S-M/internal/sdnclient" + "github.com/Networks-it-uc3m/L2S-M/internal/utils" ) // L2NetworkReconciler reconciles a L2Network object diff --git a/internal/controller/l2network_controller_test.go b/internal/controller/l2network_controller_test.go index 8bc5490..ed91b8b 100644 --- a/internal/controller/l2network_controller_test.go +++ b/internal/controller/l2network_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) var _ = Describe("L2Network Controller", func() { diff --git a/internal/controller/networkedgedevice_controller.go b/internal/controller/networkedgedevice_controller.go index 68fbddc..2f6a38c 100644 --- a/internal/controller/networkedgedevice_controller.go +++ b/internal/controller/networkedgedevice_controller.go @@ -22,12 +22,12 @@ import ( "fmt" "time" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" + "github.com/Networks-it-uc3m/L2S-M/internal/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" - "l2sm.k8s.local/controllermanager/internal/utils" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/internal/controller/networkedgedevice_controller_test.go b/internal/controller/networkedgedevice_controller_test.go index 2f88d2a..9d3a00c 100644 --- a/internal/controller/networkedgedevice_controller_test.go +++ b/internal/controller/networkedgedevice_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) var _ = Describe("NetworkEdgeDevice Controller", func() { diff --git a/internal/controller/overlay_controller.go b/internal/controller/overlay_controller.go index 4434e77..833d504 100644 --- a/internal/controller/overlay_controller.go +++ b/internal/controller/overlay_controller.go @@ -22,12 +22,12 @@ import ( "fmt" "time" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" + "github.com/Networks-it-uc3m/L2S-M/internal/utils" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" - "l2sm.k8s.local/controllermanager/internal/utils" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" diff --git a/internal/controller/overlay_controller_test.go b/internal/controller/overlay_controller_test.go index da8c81a..cd13e45 100644 --- a/internal/controller/overlay_controller_test.go +++ b/internal/controller/overlay_controller_test.go @@ -27,7 +27,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) var _ = Describe("Overlay Controller", func() { diff --git a/internal/controller/pod_controller.go b/internal/controller/pod_controller.go index fc0ff9f..2df0a6b 100644 --- a/internal/controller/pod_controller.go +++ b/internal/controller/pod_controller.go @@ -22,13 +22,13 @@ import ( "fmt" "os" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" + "github.com/Networks-it-uc3m/L2S-M/internal/nedinterface" + "github.com/Networks-it-uc3m/L2S-M/internal/sdnclient" + "github.com/Networks-it-uc3m/L2S-M/internal/utils" "github.com/go-logr/logr" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" - "l2sm.k8s.local/controllermanager/internal/nedinterface" - "l2sm.k8s.local/controllermanager/internal/sdnclient" - "l2sm.k8s.local/controllermanager/internal/utils" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/internal/controller/pod_utils.go b/internal/controller/pod_utils.go index 50796fb..45cc901 100644 --- a/internal/controller/pod_utils.go +++ b/internal/controller/pod_utils.go @@ -8,10 +8,10 @@ import ( "strings" "time" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" nettypes "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/selection" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go index 4e19401..bdcab0a 100644 --- a/internal/controller/suite_test.go +++ b/internal/controller/suite_test.go @@ -34,7 +34,7 @@ import ( corev1 "k8s.io/api/core/v1" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" //+kubebuilder:scaffold:imports ) diff --git a/internal/nedinterface/nedinterface.go b/internal/nedinterface/nedinterface.go index ce70ec2..4b69530 100644 --- a/internal/nedinterface/nedinterface.go +++ b/internal/nedinterface/nedinterface.go @@ -9,8 +9,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "sigs.k8s.io/controller-runtime/pkg/client" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" nedpb "github.com/Networks-it-uc3m/l2sm-switch/pkg/nedpb" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" ) // GetConnectionInfo communicates with the NED via gRPC and returns the InterfaceNum and NodeName. diff --git a/internal/sdnclient/client.go b/internal/sdnclient/client.go index bddfad3..43f7901 100644 --- a/internal/sdnclient/client.go +++ b/internal/sdnclient/client.go @@ -3,7 +3,7 @@ package sdnclient import ( "errors" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) type ClientType string diff --git a/internal/sdnclient/external_client.go b/internal/sdnclient/external_client.go index 8fa81fd..5b25379 100644 --- a/internal/sdnclient/external_client.go +++ b/internal/sdnclient/external_client.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) // ExternalClient is part of the Client interface, and implements the SessionClient, which is a wrapper of the http function diff --git a/internal/sdnclient/internal_client.go b/internal/sdnclient/internal_client.go index 2abb09a..3cfda57 100644 --- a/internal/sdnclient/internal_client.go +++ b/internal/sdnclient/internal_client.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - l2smv1 "l2sm.k8s.local/controllermanager/api/v1" + l2smv1 "github.com/Networks-it-uc3m/L2S-M/api/v1" ) // InternalClient is part of the Client interface, and implements the SessionClient, which is a wrapper of the http function. diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index a57af56..4d17f16 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -24,7 +24,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "l2sm.k8s.local/controllermanager/test/utils" + "github.com/Networks-it-uc3m/L2S-M/test/utils" ) const namespace = "l2network-system" -- GitLab