X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-network%2Fpuppet-network-poky-stx.rb-add-vlan-support.patch;fp=meta-starlingx%2Fmeta-stx-cloud%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-network%2Fpuppet-network-poky-stx.rb-add-vlan-support.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=8df635f83d951dfb18969221cac55c243a76a2f9;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-network/puppet-network-poky-stx.rb-add-vlan-support.patch b/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-network/puppet-network-poky-stx.rb-add-vlan-support.patch
deleted file mode 100644
index 8df635f..0000000
--- a/meta-starlingx/meta-stx-cloud/recipes-support/puppet/files/puppet-network/puppet-network-poky-stx.rb-add-vlan-support.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From c08ad0a7c950cf35a3f178fe8b84beb227bfe5ca Mon Sep 17 00:00:00 2001
-From: Jackie Huang <jackie.huang@windriver.com>
-Date: Fri, 13 Nov 2020 17:45:42 +0800
-Subject: [PATCH] poky-stx.rb: add vlan support for poky-stx
-
-Current rules in poky-stx.rb doesn't recognize vlan mode,
-so add the mode option and corresponding handling for vlan
-to support vlan.
-
-Upstream-Status: Inappropriate [poky-stx specific]
-
-Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
----
- lib/puppet/provider/network_config/poky-stx.rb | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puppet/provider/network_config/poky-stx.rb b/lib/puppet/provider/network_config/poky-stx.rb
-index 17fa34c..9b0506a 100644
---- a/lib/puppet/provider/network_config/poky-stx.rb
-+++ b/lib/puppet/provider/network_config/poky-stx.rb
-@@ -45,7 +45,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-
-     # These fields are going to get rearranged to resolve issue 16
-     # https://github.com/adrienthebo/puppet-network/issues/16
--    attr_accessor :ipaddress, :netmask, :family, :method, :mtu
-+    attr_accessor :ipaddress, :netmask, :family, :method, :mtu, :mode
-
-     # Options hash
-     attr_reader :options
-@@ -66,6 +66,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-         :family    => @family,
-         :method    => @method,
-         :mtu       => @mtu,
-+        :mode      => @mode,
-         :options   => squeeze_options
-       }
-
-@@ -185,6 +186,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-           #Instance[name].name   = name
-           Instance[name].family = family
-           Instance[name].method = method
-+          Instance[name].mode   = :raw
-
-         else
-           # If we match on a string with a leading iface, but it isn't in the
-@@ -219,6 +221,7 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-             when 'address'; Instance[name].ipaddress    = val
-             when 'netmask'; Instance[name].netmask      = val
-             when 'mtu';     Instance[name].mtu          = val
-+            when 'vlan-raw-device'; Instance[name].mode = :vlan
-             else            Instance[name].options[key] << val
-             end
-           else
-@@ -260,6 +263,11 @@ Puppet::Type.type(:network_config).provide(:pokystx) do
-         stanza << %{iface #{provider.name} #{provider.family} #{provider.method}}
-       end
-
-+      if provider.options['VLAN'] and  provider.options['VLAN'] == 'yes'
-+        raw_device = provider.options['PHYSDEV']
-+        stanza << "    vlan-raw-device #{raw_device}"
-+      end
-+
-       [
-         [:ipaddress, 'address'],
-         [:netmask,   'netmask'],
---
-2.7.4