commit fcc419b3dac9003d5c775db7d9225a55857dc237
author Andrew Geissler <geissonator@yahoo.com> Thu Jun 04 10:26:16 2020 -0500
committer Andrew Geissler <geissonator@yahoo.com> Fri Jun 05 14:47:36 2020 +0000
tree e11f958750f3fa952e7e3a66e4b10908f705e57e
parent a97d93bedc724b204a910ca81794b610ba2f8d73

Revert "Reapply: "Enhance DHCP beyond just OFF and IPv4/IPv6 enabled.""

This reverts commit 4ab49c461f9940245f646bdf6dbd964eeb98688b.

The requisite commit in phosphor-network is having some issues getting
through CI:
https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-networkd/+/24666

Until this is ready, need to revert this change so that
phosphor-dbus-interface bumps can start getting through CI again.

Change-Id: I216f1a05d22093f4e1bb69c48e1af609653b8a1b
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>

xyz/openbmc_project/Network/EthernetInterface.interface.yaml

diff --git a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
index b968106..b18f6c7 100644
--- a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
+++ b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml
@@ -23,7 +23,7 @@
       description: >
           Domain names of the ethernet interface.
     - name: DHCPEnabled
-      type: enum[self.DHCPConf]
+      type: boolean
       description: >
           Address mode of the ethernet interface.
     - name: Nameservers
@@ -82,11 +82,4 @@
         - name: v4
         - name: v6
         - name: none
-    - name: DHCPConf
-      description: >
-          A list of the permitted DHCP settings used by systemd.
-      values:
-        - name: both
-        - name: v4
-        - name: v6
-        - name: none
+