separate resource requirements

Signed-off-by: John Leung <john.leung@intel.com>

Author: jcleung5549

Server/OCPServerHardwareManagement.v1_1_0.json

@@ -232,12 +232,16 @@
 				}
 			}
 		},
-		"PowerSubsystem/EnvironmentMetrics": {
-			"ReadRequirement": "IfImplemented",
-			"PropertyRequirements": {
-				"PowerConsumedWatts": {},
-				"PowerCapacityWatts": {},
-				"PowerLimitWatts": {}
+		"PowerSubsystem": {
+            "PropertyRequirements": {
+                "EnvironmentMetrics": {
+			        "ReadRequirement": "IfImplemented",
+			        "PropertyRequirements": {
+				        "PowerConsumedWatts": {},
+				        "PowerCapacityWatts": {},
+				        "PowerLimitWatts": {}
+                    }
+                }
 			}
 		},
         "Thermal": {