commit 36fedf238ff561539c6f82f9cac2799783ac0cfd
author George Keishing <gkeishin@in.ibm.com> Tue Mar 21 06:30:27 2017 -0500
committer Andrew Geissler <geissonator@yahoo.com> Wed Mar 22 13:05:08 2017 +0000
tree 95bbef0e2b147f689da731006306011cb19a923a
parent 16333ec57d98f722983d8229373e23db384272e1

Inventory "core" entry and "functional" state

Added:
   - "core" inventory item
   - "fru" and "core" function state property

Resolves openbmc/openbmc-test-automation#430

Change-Id: Idf630e283a6326cb17aaabe815c125c0fc2dc48b
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

bin/generate_inventory

diff --git a/bin/generate_inventory b/bin/generate_inventory
index 4160f1f..2aa9e93 100755
--- a/bin/generate_inventory
+++ b/bin/generate_inventory
@@ -13,7 +13,7 @@
 from gen_print import *
 
 # This list will be longer when more development codes are available.
-inventory_items = ['fru']
+inventory_items = ['fru', 'core']
 print_var(inventory_items)
 fru_inventory_file_path = 'inventory.py'
 print_var(fru_inventory_file_path)
@@ -25,19 +25,25 @@
 cmd_buf = 'git clone https://github.com/openbmc/phosphor-dbus-interfaces'
 os.system(cmd_buf)
 
-repo_subdir_path = '/phosphor-dbus-interfaces/xyz/openbmc_project/Inventory/'
+repo_subdir_path = '/phosphor-dbus-interfaces/xyz/openbmc_project/'
 base_dir_path = os.getcwd() + repo_subdir_path
 
 # yaml file paths for FRU
-yaml_fru_list = [ 'Item.interface.yaml',
-                  'Decorator/Asset.interface.yaml',
-                  'Decorator/Revision.interface.yaml',
-                  'Decorator/Replaceable.interface.yaml',
-                  'Decorator/Cacheable.interface.yaml',
+yaml_fru_list = [ 'Inventory/Item.interface.yaml',
+                  'Inventory/Decorator/Asset.interface.yaml',
+                  'Inventory/Decorator/Revision.interface.yaml',
+                  'Inventory/Decorator/Replaceable.interface.yaml',
+                  'Inventory/Decorator/Cacheable.interface.yaml',
+                  'State/Decorator/OperationalStatus.interface.yaml',
                  ]
 
+# yaml file paths for CORE
+yaml_core_list = [ 'Inventory/Item.interface.yaml',
+                   'State/Decorator/OperationalStatus.interface.yaml',
+                 ]
 # Append to master list
 yaml_master_list.append(yaml_fru_list)
+yaml_master_list.append(yaml_core_list)
 
 print_var(yaml_master_list)
 

data/inventory.py

diff --git a/data/inventory.py b/data/inventory.py
index 51ee185..c20b551 100644
--- a/data/inventory.py
+++ b/data/inventory.py
@@ -1,4 +1,9 @@
 inventory_dict = {
+    "core":[
+        "PrettyName",
+        "Present",
+        "Functional"
+    ],
     "fru":[
         "PrettyName",
         "Present",
@@ -9,6 +14,7 @@
         "Model",
         "Version",
         "FieldReplaceable",
-        "Cached"
+        "Cached",
+        "Functional"
     ]
-}
+}
\ No newline at end of file