Merge pull request #1522 from lsst-it/IT-5672_vlan1702_yagan

(cluster/yagan) add VLAN1702
lsst-it · Nov 6, 2024 · f5e4e09 · f5e4e09
2 parents 0b02331 + 8b8fc23
commit f5e4e09
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 2 deletions.
diff --git a/hieradata/cluster/yagan/variant/1114s.yaml b/hieradata/cluster/yagan/variant/1114s.yaml
@@ -56,6 +56,21 @@ nm::connections:
       ipv6:
         method: "disabled"
       proxy: {}
+  br1702:
+    content:
+      connection:
+        id: "br1702"
+        uuid: "c12dba25-7a36-4ba1-aaf0-cf274990df01"
+        type: "bridge"
+        interface-name: "br1702"
+      ethernet: {}
+      bridge:
+        stp: "false"
+      ipv4:
+        method: "disabled"
+      ipv6:
+        method: "disabled"
+      proxy: {}
   br1800:
     content:
       connection:

diff --git a/hieradata/cluster/yagan/variant/1114s/subvariant/1.01.yaml b/hieradata/cluster/yagan/variant/1114s/subvariant/1.01.yaml
@@ -68,6 +68,21 @@ nm::connections:
         id: "1201"
         parent: "enp1s0f1"
       bridge-port: {}
+  enp1s0f1.1702:
+    content:
+      connection:
+        id: "enp1s0f1.1702"
+        uuid: "dc2b8fc9-b3f1-4657-891d-6bf15bdb896a"
+        type: "vlan"
+        interface-name: "enp1s0f1.1702"
+        master: "br1702"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "1702"
+        parent: "enp1s0f1"
+      bridge-port: {}
   enp1s0f1.1800:
     content:
       connection:

diff --git a/hieradata/cluster/yagan/variant/1114s/subvariant/1.02.yaml b/hieradata/cluster/yagan/variant/1114s/subvariant/1.02.yaml
@@ -68,6 +68,21 @@ nm::connections:
         id: "1201"
         parent: "enp197s0f1"
       bridge-port: {}
+  enp197s0f1.1702:
+    content:
+      connection:
+        id: "enp197s0f1.1702"
+        uuid: "dba89471-c57d-435c-a1c7-d9c4c6e59cbb"
+        type: "vlan"
+        interface-name: "enp197s0f1.1702"
+        master: "br1702"
+        slave-type: "bridge"
+      ethernet: {}
+      vlan:
+        flags: "1"
+        id: "1702"
+        parent: "enp197s0f1"
+      bridge-port: {}
   enp197s0f1.1800:
     content:
       connection:

diff --git a/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb
@@ -67,7 +67,7 @@
       it { is_expected.to contain_class('cni::plugins::dhcp') }
       it { is_expected.to contain_class('profile::core::ospl').with_enable_rundir(true) }
 
-      it { is_expected.to have_nm__connection_resource_count(11) }
+      it { is_expected.to have_nm__connection_resource_count(13) }
 
       %w[
         eno1np0
@@ -122,6 +122,22 @@
         it_behaves_like 'nm bridge interface'
       end
 
+      context 'with enp1s0f1.1702' do
+        let(:interface) { 'enp1s0f1.1702' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm vlan interface', id: 1702, parent: 'enp1s0f1'
+        it_behaves_like 'nm bridge slave interface', master: 'br1702'
+      end
+
+      context 'with br1702' do
+        let(:interface) { 'br1702' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm no-ip interface'
+        it_behaves_like 'nm bridge interface'
+      end
+
       context 'with enp1s0f1.1800' do
         let(:interface) { 'enp1s0f1.1800' }
 

diff --git a/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb b/spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb
@@ -64,7 +64,7 @@
 
       it { is_expected.to contain_class('profile::core::ospl').with_enable_rundir(true) }
 
-      it { is_expected.to have_nm__connection_resource_count(11) }
+      it { is_expected.to have_nm__connection_resource_count(13) }
 
       %w[
         eno1np0
@@ -119,6 +119,22 @@
         it_behaves_like 'nm bridge interface'
       end
 
+      context 'with enp197s0f1.1702' do
+        let(:interface) { 'enp197s0f1.1702' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm vlan interface', id: 1702, parent: 'enp197s0f1'
+        it_behaves_like 'nm bridge slave interface', master: 'br1702'
+      end
+
+      context 'with br1702' do
+        let(:interface) { 'br1702' }
+
+        it_behaves_like 'nm enabled interface'
+        it_behaves_like 'nm no-ip interface'
+        it_behaves_like 'nm bridge interface'
+      end
+
       context 'with enp197s0f1.1800' do
         let(:interface) { 'enp197s0f1.1800' }