settings yaml: enable multiple interfaces

The settings manager now supports multiple interfaces per settings
object. For that reason, the settings yaml should contain a list of
interfaces under each settings object.

Change-Id: Ief5aff4c1305c3ee0629ecd1b7da5868b4b4c73e
Signed-off-by: Deepak Kodihalli <dkodihal@in.ibm.com>

3 files changed, 75 insertions, 74 deletions

diff --git a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml
index 5b883417a..7aff75415 100644
--- a/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml
+++ b/meta-openbmc-machines/meta-openpower/meta-ingrasys/meta-zaius/recipes-phosphor/settings/phosphor-settings-manager/powerpolicy-default-ALWAYS_POWER_ON.override.yml
@@ -1,5 +1,6 @@
 ---
 /xyz/openbmc_project/control/host0/power_restore_policy:
-    Interface: xyz.openbmc_project.Control.Power.RestorePolicy
-    Defaults:
-        PowerRestorePolicy: RestorePolicy::Policy::AlwaysOn
+    - Interface: xyz.openbmc_project.Control.Power.RestorePolicy
+      Properties:
+          PowerRestorePolicy:
+              Default: RestorePolicy::Policy::AlwaysOn
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
index a3c17b405..00586c948 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-defaults/defaults.yaml
@@ -1,93 +1,93 @@
 /xyz/openbmc_project/control/minimum_ship_level_required:
-    Interface: xyz.openbmc_project.Control.MinimumShipLevel
-    Properties:
-        MinimumShipLevelRequired:
-           Default: 'true'
+    - Interface: xyz.openbmc_project.Control.MinimumShipLevel
+      Properties:
+          MinimumShipLevelRequired:
+             Default: 'true'
 
 /xyz/openbmc_project/control/host0/auto_reboot:
-    Interface: xyz.openbmc_project.Control.Boot.RebootPolicy
-    Properties:
-        AutoReboot:
-           Default: 'true'
+    - Interface: xyz.openbmc_project.Control.Boot.RebootPolicy
+      Properties:
+          AutoReboot:
+             Default: 'true'
 
 /xyz/openbmc_project/control/host0/boot_source:
-    Interface: xyz.openbmc_project.Control.Boot.Source
-    Properties:
-        BootSource:
-            Default: Source::Sources::Default
+    - Interface: xyz.openbmc_project.Control.Boot.Source
+      Properties:
+          BootSource:
+              Default: Source::Sources::Default
 
 /xyz/openbmc_project/control/host0/boot_mode:
-    Interface: xyz.openbmc_project.Control.Boot.Mode
-    Properties:
-        BootMode:
-            Default: Mode::Modes::Regular
+    - Interface: xyz.openbmc_project.Control.Boot.Mode
+      Properties:
+          BootMode:
+              Default: Mode::Modes::Regular
 
 /xyz/openbmc_project/control/host0/power_cap:
-    Interface: xyz.openbmc_project.Control.Power.Cap
-    Properties:
-        PowerCap:
-            Default: 0
-            Validation:
-                Type: "range"
-                Validator: "0..1000"
-                Unit: "Watts"
-        PowerCapEnable:
-             Default: 'false'
-
+    - Interface: xyz.openbmc_project.Control.Power.Cap
+      Properties:
+          PowerCap:
+              Default: 0
+              Validation:
+                  Type: "range"
+                  Validator: "0..1000"
+                  Unit: "Watts"
+          PowerCapEnable:
+               Default: 'false'
+  
 /xyz/openbmc_project/control/host0/power_restore_policy:
-    Interface: xyz.openbmc_project.Control.Power.RestorePolicy
-    Properties:
-        PowerRestorePolicy:
-            Default: RestorePolicy::Policy::AlwaysOff
+    - Interface: xyz.openbmc_project.Control.Power.RestorePolicy
+      Properties:
+          PowerRestorePolicy:
+              Default: RestorePolicy::Policy::AlwaysOff
 
 /xyz/openbmc_project/time/owner:
-    Interface: xyz.openbmc_project.Time.Owner
-    Properties:
-        TimeOwner:
-            Default: Owner::Owners::BMC
+    - Interface: xyz.openbmc_project.Time.Owner
+      Properties:
+          TimeOwner:
+              Default: Owner::Owners::BMC
 
 /xyz/openbmc_project/time/sync_method:
-    Interface: xyz.openbmc_project.Time.Synchronization
-    Properties:
-        TimeSyncMethod:
-            Default: Synchronization::Method::NTP
+    - Interface: xyz.openbmc_project.Time.Synchronization
+      Properties:
+          TimeSyncMethod:
+              Default: Synchronization::Method::NTP
 
 /xyz/openbmc_project/network/host0/intf:
-    Interface: xyz.openbmc_project.Network.MACAddress
-    Properties:
-        MACAddress:
-            Default: '"00:00:00:00:00:00"'
-            Validation:
-                Type: "regex"
-                Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$'
+    - Interface: xyz.openbmc_project.Network.MACAddress
+      Properties:
+          MACAddress:
+              Default: '"00:00:00:00:00:00"'
+              Validation:
+                  Type: "regex"
+                  Validator: '^([0-9A-Fa-f]{2}[:-]){5}([0-9A-Fa-f]{2})$'
 
 #needs to implement address validation TODO openbmc/issues/2046
 /xyz/openbmc_project/network/host0/intf/addr:
-    Interface: xyz.openbmc_project.Network.IP
-    Properties:
-        Address:
-            Default: '"0.0.0.0"'
-        PrefixLength:
-            Default: 0
-            Validation:
-                Type: "range"
-                Validator: 0..128
-                Unit: "bits"
-        Origin:
-            Default: IP::AddressOrigin::Static
-        Gateway:
-            Default: '"0.0.0.0"'
-        Type:
-            Default: IP::Protocol::IPv4
+    - Interface: xyz.openbmc_project.Network.IP
+      Properties:
+          Address:
+              Default: '"0.0.0.0"'
+          PrefixLength:
+              Default: 0
+              Validation:
+                  Type: "range"
+                  Validator: 0..128
+                  Unit: "bits"
+          Origin:
+              Default: IP::AddressOrigin::Static
+          Gateway:
+              Default: '"0.0.0.0"'
+          Type:
+              Default: IP::Protocol::IPv4
 
 /xyz/openbmc_project/control/host0/restriction_mode:
-    Interface: xyz.openbmc_project.Control.Security.RestrictionMode
-    Properties:
-        RestrictionMode:
-            Default: RestrictionMode::Modes::None
+    - Interface: xyz.openbmc_project.Control.Security.RestrictionMode
+      Properties:
+          RestrictionMode:
+              Default: RestrictionMode::Modes::None
 
 /xyz/openbmc_project/control/host0/TPMEnable:
-    Interface: xyz.openbmc_project.Control.TPM.Policy
-    Properties:
-        TPMEnable:
-           Default: 'false'
+    - Interface: xyz.openbmc_project.Control.TPM.Policy
+      Properties:
+          TPMEnable:
+             Default: 'false'
diff --git a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
index 2a47ffb03..c2b65baf4 100644
--- a/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
+++ b/meta-phosphor/common/recipes-phosphor/settings/phosphor-settings-manager.inc
@@ -2,4 +2,4 @@ HOMEPAGE = "http://github.com/openbmc/phosphor-settingsd"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc"
 SRC_URI += "git://github.com/openbmc/phosphor-settingsd"
-SRCREV = "242bc77c441eb7863e6bb7f513fe92016d6b0732"
+SRCREV = "db8386263b86d967e78a5af7607fa4a3f677be1d"