Merge pull request #783 from yast/more_cwm_objects

More Object CWM + dead code removal
yast · May 2, 2019 · f177a18 · f177a18
2 parents 5143f1f + f3e5d94
commit f177a18
Show file tree

Hide file tree

Showing 18 changed files with 806 additions and 833 deletions.
diff --git a/src/include/network/complex.rb b/src/include/network/complex.rb
@@ -65,135 +65,6 @@ def Hyperlink(href, text)
       Builtins.sformat("<a href=\"%1\">%2</a>", href, text)
     end
 
-    # Build textual summary
-    # @param [Boolean] split split configured and unconfigured?
-    # @param [Boolean] link  add a link to configure the device (only if !split)
-    # @return [ configured, unconfigured ] if split, [ summary, links ] otherwise
-    def BuildSummaryDevs(devs, hardware, split, link)
-      devs = deep_copy(devs)
-      hardware = deep_copy(hardware)
-      Builtins.y2milestone("Devs=%1", NetworkInterfaces.ConcealSecrets(devs))
-      Builtins.y2milestone("Hardware=%1", hardware)
-      Builtins.y2debug("split=%1", split)
-
-      uniques = []
-      uniques_old = []
-      configured = []
-      unconfigured = []
-      links = []
-
-      # build a list of configured devices
-      Builtins.maplist(devs) do |devtype, devsmap|
-        Builtins.maplist(
-          Convert.convert(devsmap, from: "map", to: "map <string, map>")
-        ) do |devname, devmap|
-          # main device summary
-          descr = BuildDescription(devtype, devname, devmap, hardware)
-          unq = Ops.get_string(devmap, "UNIQUE", "")
-          status = DeviceStatus(devtype, devname, devmap)
-          if link
-            if devtype == "wlan" &&
-                Ops.get_string(devmap, "WIRELESS_AUTH_MODE", "") == "open" &&
-                Ops.get_string(devmap, "WIRELESS_KEY_0", "") == ""
-              href = Ops.add("lan--wifi-encryption-", devname)
-              # interface summary: WiFi without encryption
-              warning = HTML.Colorize(
-                _("Warning: no encryption is used."),
-                "red"
-              )
-              status = Ops.add(
-                Ops.add(Ops.add(Ops.add(status, " "), warning), " "),
-                # Hyperlink: Change the configuration of an interface
-                Hyperlink(href, _("Change."))
-              )
-              links = Builtins.add(links, href)
-            end
-          end
-          configured = Builtins.add(configured, Summary.Device(descr, status))
-          uniques = Builtins.add(uniques, devname)
-          uniques_old = Builtins.add(uniques_old, unq)
-          # aliases summary
-          aliasee = Ops.get_map(devmap, "_aliases", {})
-          Builtins.maplist(aliasee) do |_aid, amap|
-            # Table item
-            # this is what used to be Virtual Interface
-            # (eth0:1)
-            descr = _("Additional Address")
-            status = DeviceStatus(devtype, devname, amap)
-            configured = Builtins.add(configured, Summary.Device(descr, status))
-          end if aliasee != {}
-        end
-      end
-
-      Builtins.y2debug("uniques(%1)", uniques)
-      Builtins.y2debug("uniques_old(%1)", uniques_old)
-
-      # build a list of unconfigured devices
-      id = 0
-      Builtins.maplist(hardware) do |h|
-        unq = Ops.get_string(h, "unique", "")
-        busid = Ops.add(
-          Ops.add(Ops.add("bus-", Ops.get_string(h, "bus", "")), "-"),
-          Ops.get_string(h, "busid", "")
-        )
-        mac = Ops.add("id-", Ops.get_string(h, "mac", ""))
-        hwtype = Ops.get_string(h, "type", "")
-        hwname = CheckEmptyName(hwtype, Ops.get_string(h, "name", ""))
-        Builtins.y2debug("busid=%1, mac=%2", busid, mac)
-        if !Builtins.contains(uniques, busid) &&
-            !Builtins.contains(uniques, mac) &&
-            !Builtins.contains(uniques_old, unq)
-          if split && !Builtins.contains(uniques_old, unq)
-            Ops.set(h, "id", id)
-            unconfigured = Builtins.add(unconfigured, h)
-          else
-            configured = Builtins.add(
-              configured,
-              Summary.Device(hwname, Summary.NotConfigured)
-            )
-          end
-        end
-        id = Ops.add(id, 1)
-      end
-
-      Builtins.y2debug("configured=%1", configured)
-      Builtins.y2debug("unconfigured=%1", unconfigured)
-
-      # create a summary text
-      summary = Summary.DevicesList(configured)
-      # if not split -> summary is finished
-      return [summary, links] if !split
-
-      # add headers
-      summary = if Ops.greater_than(Builtins.size(configured), 0)
-        # Summary text
-        Ops.add(
-          Summary.AddHeader("", _("Already Configured Devices:")),
-          summary
-        )
-      else
-        # Summary text
-        Summary.AddHeader("", _("Nothing is configured"))
-      end
-
-      # FIXME: OtherDevices(devs, type);
-
-      Builtins.y2debug("summary=%1", summary)
-
-      [summary, unconfigured]
-    end
-
-    # Build textual summary
-    # @param [Boolean] split split configured and unconfigured?
-    # @param [Boolean] link  add a link to configure the device (only if !split)
-    # @return [ configured, unconfigured ] if split, [ summary, links ] otherwise
-    def BuildSummary(devregex, hardware, split, link)
-      hardware = deep_copy(hardware)
-      devs = NetworkInterfaces.FilterDevices(devregex)
-      ret = BuildSummaryDevs(devs, hardware, split, link)
-      deep_copy(ret)
-    end
-
     def CheckEmptyName(devtype, hwname)
       return hwname if !hwname.nil? && hwname != ""