commit 155362c341036b528326da2b58067f1f6125e922
author Cheng C Yang <cheng.c.yang@linux.intel.com> Wed Sep 11 07:01:09 2019 +0800
committer Cheng C Yang <cheng.c.yang@linux.intel.com> Thu Sep 12 16:29:05 2019 +0000
tree e0b3b3525d320a9b7f6cc0a0a6f7c3333d8a236b
parent a6047f2e16071d7b1a6fa48e99051d5f15a70ca8

Add Power Unit Redundant Count

Add power unit redundant count to chassis, so that power unit redundancy can
know how many PSUs are needed for fully redundancy.

Tested:
User can get RedundantCount from entity-manager D-Bus interface.

Signed-off-by: Cheng C Yang <cheng.c.yang@linux.intel.com>
Change-Id: I527c0ca8c28bfa3480329124c928d3ab672c4d28

configurations/R1000 Chassis.json

diff --git a/configurations/R1000 Chassis.json b/configurations/R1000 Chassis.json
index baab7de..add657a 100644
--- a/configurations/R1000 Chassis.json
+++ b/configurations/R1000 Chassis.json
@@ -305,6 +305,20 @@
             "Type": "FanRedundancy"
         },
         {
+            "Address": [
+                "0x50",
+                "0x51"
+            ],
+            "Bus": 7,
+            "Name": "PSU address",
+            "Type": "PSUPresence"
+        },
+        {
+            "Name": "Power Unit Redundancy",
+            "RedundantCount": 1,
+            "Type": "PURedundancy"
+        },
+        {
             "Class": "temp",
             "FFGainCoefficient": 0.0,
             "FFOffCoefficient": 0.0,
@@ -592,15 +606,6 @@
                 "Zone 5",
                 "Zone 6"
             ]
-        },
-        {
-            "Bus": 7,
-            "Address": [
-                "0x50",
-                "0x51"
-            ],
-            "Name": "PSU address",
-            "Type": "PSUPresence"
         }
     ],
     "Name": "R1000 Chassis",

configurations/R2000 Chassis.json

diff --git a/configurations/R2000 Chassis.json b/configurations/R2000 Chassis.json
index 03f3d43..dba6ae0 100644
--- a/configurations/R2000 Chassis.json
+++ b/configurations/R2000 Chassis.json
@@ -191,6 +191,20 @@
             "Type": "FanRedundancy"
         },
         {
+            "Address": [
+                "0x50",
+                "0x51"
+            ],
+            "Bus": 7,
+            "Name": "PSU address",
+            "Type": "PSUPresence"
+        },
+        {
+            "Name": "Power Unit Redundancy",
+            "RedundantCount": 1,
+            "Type": "PURedundancy"
+        },
+        {
             "Class": "fan",
             "FFGainCoefficient": 1.0,
             "FFOffCoefficient": 0.0,
@@ -472,15 +486,6 @@
                 "Zone 5",
                 "Zone 6"
             ]
-        },
-        {
-            "Bus": 7,
-            "Address": [
-                "0x50",
-                "0x51"
-            ],
-            "Name": "PSU address",
-            "Type": "PSUPresence"
         }
     ],
     "Name": "R2000 Chassis",