From 3d499b85e1f189dad8325ac331a15f24605a922e Mon Sep 17 00:00:00 2001 From: Carlos Barria Date: Mon, 4 Nov 2024 11:45:26 -0300 Subject: [PATCH] (cluster/yagan) add VLAN1702 --- hieradata/cluster/yagan/variant/1114s.yaml | 15 +++++++++++++++ .../yagan/variant/1114s/subvariant/1.01.yaml | 15 +++++++++++++++ .../yagan/variant/1114s/subvariant/1.02.yaml | 15 +++++++++++++++ spec/hosts/nodes/yagan01.cp.lsst.org_spec.rb | 18 +++++++++++++++++- spec/hosts/nodes/yagan11.cp.lsst.org_spec.rb | 18 +++++++++++++++++- 5 files changed, 79 insertions(+), 2 deletions(-) diff --git a/hieradata/cluster/yagan/variant/1114s.yaml b/hieradata/cluster/yagan/variant/1114s.yaml index 3b94261a6c..807448940b 100644 --- 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 index f18ba66e81..4d66965f78 100644 --- 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 index d15580ff9f..3b0853c575 100644 --- 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 index 22f1e8524b..ca85fcd2d8 100644 --- 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 index aaca173b7c..d62e45b76a 100644 --- 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' }