Dav/pr to official

README.md

@@ -12,7 +12,7 @@ This is not an officially supported Google product.
 ## Goal
 
 For network emulation, there are many approaches using VM's for emulation of a
-hardware router. Arista, Cisco, Juniper, and Nokia have multiple implementations
+hardware router. Arista, Cisco, Juniper, Drivenets, and Nokia have multiple implementations
 of their network operating system and various generations of hardware emulation.
 These systems are very good for most validation of vendor control plane
 implementations and data plane for limited certifications. The idea of this

api/metallb/clientset/v1beta1/ipaddresspool_test.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/h-fam/errdiff"
+	"github.com/openconfig/gnmi/errdiff"
 	metallbv1 "go.universe.tf/metallb/api/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

api/metallb/clientset/v1beta1/l2advertisement_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
-	"github.com/h-fam/errdiff"
+	"github.com/openconfig/gnmi/errdiff"
 	metallbv1 "go.universe.tf/metallb/api/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

cloudbuild/external.pkr.hcl

@@ -64,15 +64,15 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing docker...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install apt-transport-https ca-certificates curl gnupg lsb-release -y",
+      "sudo apt-get update",
+      "sudo apt-get install apt-transport-https ca-certificates curl gnupg lsb-release -y",
       "curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg",
       "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install docker-ce docker-ce-cli containerd.io build-essential -y",
+      "sudo apt-get update",
+      "sudo apt-get install docker-ce docker-ce-cli containerd.io build-essential -y",
       "sudo usermod -aG docker $USER",
       "sudo docker version",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install openvswitch-switch-dpdk -y",   # install openvswitch for cisco containers
+      "sudo apt-get install openvswitch-switch-dpdk -y",   # install openvswitch for cisco containers
       "echo \"fs.inotify.max_user_instances=64000\" | sudo tee -a /etc/sysctl.conf", # configure inotify for cisco xrd containers
       "echo \"kernel.pid_max=1048575\" | sudo tee -a /etc/sysctl.conf",              # configure pid_max for cisco 8000e containers
       "sudo sysctl -p",
@@ -82,10 +82,10 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing kubectl...",
-      "curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg",
-      "echo \"deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main\" | sudo tee /etc/apt/sources.list.d/kubernetes.list",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install kubelet kubeadm kubectl -y",
+      "curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg",
+      "echo \"deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /\" | sudo tee /etc/apt/sources.list.d/kubernetes.list",
+      "sudo apt-get update",
+      "sudo apt-get install kubelet kubeadm kubectl -y",
       "kubectl version --client",
       "echo 'source <(kubectl completion bash)' >> ~/.bashrc",
       "echo 'alias k=kubectl' >> ~/.bashrc",
@@ -106,14 +106,14 @@ build {
       "echo Installing multinode cluster dependencies...",
       "git clone https://github.com/flannel-io/flannel.git",
       "curl --create-dirs -o third_party/licenses/flannel/LICENSE https://raw.githubusercontent.com/flannel-io/flannel/master/LICENSE",
-      "git clone https://github.com/Mirantis/cri-dockerd.git --branch v0.3.1",
+      "git clone https://github.com/Mirantis/cri-dockerd.git",
       "cd cri-dockerd",
       "PATH=$PATH:/usr/local/go/bin",
       "/home/$USER/go/bin/go-licenses check github.com/Mirantis/cri-dockerd",
       "/home/$USER/go/bin/go-licenses save github.com/Mirantis/cri-dockerd --save_path=\"../third_party/licenses/cri-dockerd\"",
-      "/usr/local/go/bin/go build",
-      "sudo cp cri-dockerd /usr/local/bin/",
-      "sudo cp -a packaging/systemd/* /etc/systemd/system",
+      "make cri-dockerd",
+      "sudo install -o root -g root -m 0755 cri-dockerd /usr/local/bin/cri-dockerd",
+      "sudo install packaging/systemd/* /etc/systemd/system",
       "sudo sed -i -e 's,/usr/bin/cri-dockerd,/usr/local/bin/cri-dockerd,' /etc/systemd/system/cri-docker.service",
       "sudo systemctl enable cri-docker.socket",
     ]
@@ -122,7 +122,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing kind...",
-      "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.19.0",
+      "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.22.0",
       "curl --create-dirs -o third_party/licenses/kind/LICENSE https://raw.githubusercontent.com/kubernetes-sigs/kind/main/LICENSE",
       "sudo cp /home/$USER/go/bin/kind /usr/local/bin/",
       "/home/$USER/go/bin/kind version",
@@ -132,7 +132,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Cloning openconfig/kne github repo...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install git -y",
+      "sudo apt-get install git -y",
       "git clone -b ${var.branch_name} https://github.com/openconfig/kne.git",
       "cd kne",
       "PATH=$PATH:/usr/local/go/bin",
@@ -160,7 +160,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing openconfig tools...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install tree -y",
+      "sudo apt-get install tree -y",
       "bash -c \"$(curl -sL https://get-gnmic.openconfig.net)\"",
       "bash -c \"$(curl -sL https://get-gribic.kmrd.dev)\"",
       "bash -c \"$(curl -sL https://get-gnoic.kmrd.dev)\"",

cloudbuild/internal.pkr.hcl

@@ -64,15 +64,15 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing docker...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install apt-transport-https ca-certificates curl gnupg lsb-release -y",
+      "sudo apt-get update",
+      "sudo apt-get install apt-transport-https ca-certificates curl gnupg lsb-release -y",
       "curl -fsSL https://download.docker.com/linux/debian/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg",
       "echo \"deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable\" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install docker-ce docker-ce-cli containerd.io build-essential -y",
+      "sudo apt-get update",
+      "sudo apt-get install docker-ce docker-ce-cli containerd.io build-essential -y",
       "sudo usermod -aG docker $USER",
       "sudo docker version",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install openvswitch-switch-dpdk -y",   # install openvswitch for cisco containers
+      "sudo apt-get install openvswitch-switch-dpdk -y",   # install openvswitch for cisco containers
       "echo \"fs.inotify.max_user_instances=64000\" | sudo tee -a /etc/sysctl.conf", # configure inotify for cisco xrd containers
       "echo \"kernel.pid_max=1048575\" | sudo tee -a /etc/sysctl.conf",              # configure pid_max for cisco 8000e containers
       "sudo sysctl -p",
@@ -82,7 +82,6 @@ build {
       "sudo docker pull us-west1-docker.pkg.dev/gep-kne/arista/ceos:ga",
       "sudo docker pull us-west1-docker.pkg.dev/gep-kne/cisco/xrd:ga",
       "sudo docker pull us-west1-docker.pkg.dev/gep-kne/cisco/8000e:ga",
-      "sudo docker pull us-west1-docker.pkg.dev/gep-kne/juniper/cptx:ga",
       "sudo docker pull us-west1-docker.pkg.dev/gep-kne/juniper/ncptx:ga",
       "sudo docker pull us-west1-docker.pkg.dev/gep-kne/nokia/srlinux:ga",
     ]
@@ -91,10 +90,10 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing kubectl...",
-      "curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-archive-keyring.gpg",
-      "echo \"deb [signed-by=/etc/apt/keyrings/kubernetes-archive-keyring.gpg] https://apt.kubernetes.io/ kubernetes-xenial main\" | sudo tee /etc/apt/sources.list.d/kubernetes.list",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 update",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install kubelet kubeadm kubectl -y",
+      "curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg",
+      "echo \"deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /\" | sudo tee /etc/apt/sources.list.d/kubernetes.list",
+      "sudo apt-get update",
+      "sudo apt-get install kubelet kubeadm kubectl -y",
       "kubectl version --client",
       "echo 'source <(kubectl completion bash)' >> ~/.bashrc",
       "echo 'alias k=kubectl' >> ~/.bashrc",
@@ -106,11 +105,12 @@ build {
     inline = [
       "echo Installing multinode cluster dependencies...",
       "git clone https://github.com/flannel-io/flannel.git",
-      "git clone https://github.com/Mirantis/cri-dockerd.git --branch v0.3.1",
+      "git clone https://github.com/Mirantis/cri-dockerd.git",
       "cd cri-dockerd",
-      "/usr/local/go/bin/go build",
-      "sudo cp cri-dockerd /usr/local/bin/",
-      "sudo cp -a packaging/systemd/* /etc/systemd/system",
+      "PATH=$PATH:/usr/local/go/bin",
+      "make cri-dockerd",
+      "sudo install -o root -g root -m 0755 cri-dockerd /usr/local/bin/cri-dockerd",
+      "sudo install packaging/systemd/* /etc/systemd/system",
       "sudo sed -i -e 's,/usr/bin/cri-dockerd,/usr/local/bin/cri-dockerd,' /etc/systemd/system/cri-docker.service",
       "sudo systemctl enable cri-docker.socket",
     ]
@@ -119,7 +119,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing kind...",
-      "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.19.0",
+      "/usr/local/go/bin/go install sigs.k8s.io/kind@v0.22.0",
       "sudo cp /home/$USER/go/bin/kind /usr/local/bin/",
       "/home/$USER/go/bin/kind version",
     ]
@@ -128,7 +128,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Cloning openconfig/kne github repo...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install git -y",
+      "sudo apt-get install git -y",
       "git clone -b ${var.branch_name} https://github.com/openconfig/kne.git",
       "cd kne/kne_cli",
       "/usr/local/go/bin/go build -o kne",
@@ -164,7 +164,7 @@ build {
   provisioner "shell" {
     inline = [
       "echo Installing openconfig tools...",
-      "sudo apt-get -o DPkg::Lock::Timeout=60 install tree -y",
+      "sudo apt-get install tree -y",
       "bash -c \"$(curl -sL https://get-gnmic.openconfig.net)\"",
       "bash -c \"$(curl -sL https://get-gribic.kmrd.dev)\"",
       "bash -c \"$(curl -sL https://get-gnoic.kmrd.dev)\"",
@@ -179,4 +179,11 @@ build {
       "rm add-google-cloud-ops-agent-repo.sh",
     ]
   }
+
+  provisioner "shell" {
+    inline = [
+      "echo Installing network diagnosis tools...",
+      "sudo apt-get install net-tools iptables nftables -y",
+    ]
+  }
 }

cloudbuild/vendors/ceos.cfg

@@ -51,6 +51,12 @@ management api gribi
    transport grpc default
       ssl profile octa-ssl-profile
 !
+p4-runtime
+   no shutdown
+   !
+   transport grpc default
+      ssl profile octa-ssl-profile
+!
 aaa authorization exec default local
 !
 ip route 0.0.0.0/0 null0