BUG#:8592

TITLE: Switch default CIM Schema to Version 2.22

DESCRIPTION:

diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index 96998f498636fd833cb6e6ff575092e8fa68e0f2..d8580decaa26b3a3f35cd282164f8bd320eccaa1 100644 (file)
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -27,7 +27,7 @@ PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
-PEGASUS_CIM_SCHEMA=CIM217
+PEGASUS_CIM_SCHEMA=CIM222
 PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
 
 PEGASUS_PROD_DIR = /opt/wbem

diff --git a/env_var_Linux.status b/env_var_Linux.status
index 317f124c329e75863aa138c6251ae751a3a75628..935eaf10712994ff8f1850cdd9dd8bbcc07ab3e1 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -31,7 +31,7 @@ PEGASUS_USE_PAM_STANDALONE_PROC=true
 PEGASUS_USE_RELEASE_CONFIG_OPTIONS=true
 PEGASUS_USE_RELEASE_DIRS=true
 PEGASUS_USE_SYSLOGS=true
-PEGASUS_CIM_SCHEMA=CIM217
+PEGASUS_CIM_SCHEMA=CIM222
 PEGASUS_USE_NET_SNMP=true
 PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
 

diff --git a/mak/config.mak b/mak/config.mak
index ea3f64fde9eb04e1cf0e60a76d0e97eee5daadfa..406fd1fab18fca7b049c8fdac7696dbaaa4d36fe 100644 (file)
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -223,7 +223,7 @@ endif
 # *****
 
 ifndef PEGASUS_CIM_SCHEMA
-    PEGASUS_CIM_SCHEMA=CIM217
+    PEGASUS_CIM_SCHEMA=CIM222
 endif
 
 CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/$(PEGASUS_CIM_SCHEMA)

diff --git a/src/Pegasus/CQL/tests/Queries/EmbeddedSelect.query.resgood b/src/Pegasus/CQL/tests/Queries/EmbeddedSelect.query.resgood
index ec429a9da36703a96823ff20b0613b696da4dff7..1f69e918cd1e6ba617b762fae8344ef10b433c16 100644 (file)
--- a/src/Pegasus/CQL/tests/Queries/EmbeddedSelect.query.resgood
+++ b/src/Pegasus/CQL/tests/Queries/EmbeddedSelect.query.resgood
@@ -23,7 +23,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 ======================================1
@@ -46,7 +46,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -79,7 +79,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 ======================================3
@@ -102,7 +102,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -139,7 +139,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -172,7 +172,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 ======================================7
@@ -195,7 +195,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #1 Name = EmbObjSub
@@ -215,7 +215,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -249,7 +249,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -269,7 +269,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -303,7 +303,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -323,7 +323,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -357,7 +357,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -377,7 +377,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -411,7 +411,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -431,7 +431,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -465,7 +465,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -485,7 +485,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -519,7 +519,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -539,7 +539,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -573,7 +573,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 -----Prop #2 Name = EmbObjSub
@@ -593,7 +593,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -613,7 +613,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Instance of class CQL_EmbeddedTestElement
 ----------Prop #0 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ======================================16
 SELECT EmbObjBase.CQL_EmbeddedTestElement::TEArray FROM CQL_EmbeddedSubClass 
 Instance of class CQL_EmbeddedSubClass
@@ -653,7 +653,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ======================================21
 SELECT EmbObjSub.CQL_NonExistent::CS,EmbObjSub.CQL_NonExistent::TPT,EmbObjSub FROM CQL_EmbeddedSubClass 
 Instance of class CQL_EmbeddedSubClass
@@ -674,7 +674,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -707,7 +707,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -740,7 +740,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -773,7 +773,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -806,7 +806,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -839,7 +839,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -872,7 +872,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1012,7 +1012,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 -----Prop #2 Name = EmbObjSub
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = InstanceID, Value = 1001
@@ -1030,7 +1030,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1068,7 +1068,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 -----Prop #2 Name = EmbObjSub
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = InstanceID, Value = 1001
@@ -1086,7 +1086,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1122,7 +1122,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 -----Prop #2 Name = EmbObjSub
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = InstanceID, Value = 1001
@@ -1140,7 +1140,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1176,7 +1176,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 -----Prop #2 Name = EmbObjSub
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = InstanceID, Value = 1001
@@ -1194,7 +1194,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1227,7 +1227,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1268,7 +1268,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1303,7 +1303,7 @@ Instance of class CQL_EmbeddedSubClass
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 -----Prop #1 Name = EmbObjSub
 ----------Instance of class CQL_EmbeddedTestPropertyTypes
 ----------Prop #0 Name = InstanceID, Value = 1001
@@ -1321,7 +1321,7 @@ Instance of class CQL_EmbeddedSubClass
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1356,7 +1356,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #5 Name = SomeString, Value = Huh?
 ======================================51
@@ -1378,7 +1378,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 --------------------Prop #0 Name = InstanceId, Value = 12
 ----------Prop #2 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #3 Name = SomeClass, Value = class of CIM_Process
 ----------Prop #4 Name = SomeString, Value = Huh?
 ----------Prop #5 Name = TE
@@ -1406,7 +1406,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 --------------------Prop #0 Name = InstanceId, Value = 10
 ----------Prop #3 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ----------Prop #4 Name = TPTArray
 --------------------Instance of class CQL_TestPropertyTypes
 --------------------Instance has 58 properties
@@ -1496,7 +1496,7 @@ Instance of class CQL_EmbeddedSubClass.  Allow missing properties.
 ----------Prop #0 Name = SomeString, Value = Huh?
 ----------Prop #1 Name = CS
 --------------------Instance of class CIM_ComputerSystem
---------------------Instance has 24 properties
+--------------------Instance has 31 properties
 ======================================58
 SELECT CQL_EmbeddedSubClass FROM CQL_EmbeddedSubClass 
 Instance of class CQL_EmbeddedSubClass

diff --git a/src/Pegasus/ControlProviders/InteropProvider/tests/interop.cpp b/src/Pegasus/ControlProviders/InteropProvider/tests/interop.cpp
index cc4e878fb174b850f9895042227ae3ee39e39120..d5efa3b0d82f8195782e27521661f6c528723f06 100644 (file)
--- a/src/Pegasus/ControlProviders/InteropProvider/tests/interop.cpp
+++ b/src/Pegasus/ControlProviders/InteropProvider/tests/interop.cpp
@@ -3419,9 +3419,9 @@ int main(int argc, char** argv)
         // Do the enumerate options tests for object manager object
         // classname, di, propertylist, expected rtn count
         it.testEnumerateOptions(
-            CIM_OBJECTMANAGER_CLASSNAME, true, CIMPropertyList(), 22);
+            CIM_OBJECTMANAGER_CLASSNAME, true, CIMPropertyList(), 29);
         it.testEnumerateOptions(
-            CIM_OBJECTMANAGER_CLASSNAME, false, CIMPropertyList(), 22);
+            CIM_OBJECTMANAGER_CLASSNAME, false, CIMPropertyList(), 29);
 
         CIMPropertyList pl1;
         Array<CIMName> pla1;
@@ -3441,9 +3441,9 @@ int main(int argc, char** argv)
         // Repeat the tests for the superclass.
         // classname, di, propertylist, expected rtn count
         it.testEnumerateOptions( CIM_WBEMSERVICE_CLASSNAME, true,
-                CIMPropertyList(),22);
+                CIMPropertyList(),29);
         it.testEnumerateOptions( CIM_WBEMSERVICE_CLASSNAME, false,
-                CIMPropertyList(), 21);
+                CIMPropertyList(), 28);
 
         it.testEnumerateOptions( CIM_WBEMSERVICE_CLASSNAME, true, pl1, 1);
         // ATTN: The following test case is incorrect.  The

diff --git a/src/Pegasus/Query/QueryExpression/tests/QExprTestSchemaR.mof b/src/Pegasus/Query/QueryExpression/tests/QExprTestSchemaR.mof
index 9bd99881ad8d2554966e648b0ff37c54e281dae1..34608a53f40a7a3861ed850c9309466384d3ac8b 100644 (file)
--- a/src/Pegasus/Query/QueryExpression/tests/QExprTestSchemaR.mof
+++ b/src/Pegasus/Query/QueryExpression/tests/QExprTestSchemaR.mof
@@ -29,12 +29,12 @@
 
 instance of QExpr_TestElement
 {
-   InstanceID = 0;
+   QExprInstanceID = 0;
 };
 
 instance of QExpr_TestPropertyTypes
 {
-   InstanceID = 1;
+   QExprInstanceID = 1;
 
    PropertyString = "Ten";
    PropertyStringArray = { "QExpr0","QExpr1","QExpr2","QExpr3" };

diff --git a/src/Pegasus/Query/QueryExpression/tests/QExpr_CIMTypes.mof b/src/Pegasus/Query/QueryExpression/tests/QExpr_CIMTypes.mof
index 235c9f5873ee01063b87ba17724d6d19745a1134..714e698dded3d78fb4585c9edc562f435f6655a4 100644 (file)
--- a/src/Pegasus/Query/QueryExpression/tests/QExpr_CIMTypes.mof
+++ b/src/Pegasus/Query/QueryExpression/tests/QExpr_CIMTypes.mof
@@ -39,7 +39,7 @@
        Description (
           "An identifier that uniquely identifies each instance "
           "of the QExpr_TestElement hierarchy.") ]
-     uint64 InstanceId;
+     uint64 QExprInstanceId;
    };
 
 

diff --git a/src/Pegasus/Query/QueryExpression/tests/Queries/QueryExpression.query.resgood b/src/Pegasus/Query/QueryExpression/tests/Queries/QueryExpression.query.resgood
index c23bd93929cb5284c63c1480ca744063cf0dfbfb..595e1dc994264e2919be9ea0b2f0b60ce4bc7916 100644 (file)
--- a/src/Pegasus/Query/QueryExpression/tests/Queries/QueryExpression.query.resgood
+++ b/src/Pegasus/Query/QueryExpression/tests/Queries/QueryExpression.query.resgood
@@ -730,7 +730,7 @@ DMTF:CQL ========Apply Projection Results========
 SELECT * FROM CIM_ComputerSystem
 
 Instance of class QExpr_TestPropertyTypes
------The property Caption is missing on the instance of class QExpr_TestPropertyTypes.
+-----The property InstanceID is missing on the instance of class QExpr_TestPropertyTypes.
 Instance of class QExpr_TestPropertyTypes.  Allow missing properties.
 -----No properties left after projection
 
@@ -770,7 +770,7 @@ DMTF:CQL ========Apply Projection Results========
 SELECT * FROM QExpr_TestElement
 
 Instance of class QExpr_TestPropertyTypes
------Prop #0 Name = InstanceId Value = 1
+-----Prop #0 Name = QExprInstanceId Value = 1
 
 DMTF:CQL ========Get Property List Results=======
 SELECT * FROM QExpr_TestElement
@@ -781,11 +781,11 @@ Get Class Path List
 Property List for the FROM class
 -----all properties required
 Property List for QExpr_TestPropertyTypes
------Required property InstanceId
+-----Required property QExprInstanceId
 SELECT Property List for the FROM class
 -----all properties required
 SELECT Property List for QExpr_TestPropertyTypes
------Required property InstanceId
+-----Required property QExprInstanceId
 WHERE Property List for the FROM class
 -----no properties required
 WHERE Property List for QExpr_TestPropertyTypes

diff --git a/src/Providers/sample/CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml b/src/Providers/sample/CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml
index 04a6654433a41ccdfdfa77a89e2b9c90e800abf5..77b6ca1711806b3f7672026fa3b79ed249c08821 100644 (file)
--- a/src/Providers/sample/CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml
+++ b/src/Providers/sample/CMPI/FilesAndDirectories/tests/EnumerateDir10001rspgood.xml
@@ -38,6 +38,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -54,6 +56,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">
@@ -152,6 +162,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -168,6 +180,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">
@@ -266,6 +286,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -282,6 +304,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">

diff --git a/src/Providers/sample/CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml b/src/Providers/sample/CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml
index b8ff2174084351dbc70d5db0bdf2d36487a446bd..dcf0875af9449ce93845379c09cc10a44aa49575 100644 (file)
--- a/src/Providers/sample/CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml
+++ b/src/Providers/sample/CMPI/FilesAndDirectories/tests/GetDirInstance10002rspgood.xml
@@ -5,6 +5,8 @@
 <IMETHODRESPONSE NAME="GetInstance">
 <IRETURNVALUE>
 <INSTANCE CLASSNAME="CWS_Directory">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -21,6 +23,14 @@
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">

diff --git a/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/EnumerateDir10001rspgood.xml b/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/EnumerateDir10001rspgood.xml
index 6bed1287603a28faadd7b4b86cc6d62a95300128..4ba9a62005f68c8f7f718b819ca97c1e6026697b 100644 (file)
--- a/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/EnumerateDir10001rspgood.xml
+++ b/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/EnumerateDir10001rspgood.xml
@@ -38,6 +38,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory_CXX">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -54,6 +56,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">
@@ -152,6 +162,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory_CXX">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -168,6 +180,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">
@@ -266,6 +286,8 @@ CIM_FileSystem
 </KEYBINDING>
 </INSTANCENAME>
 <INSTANCE CLASSNAME="CWS_Directory_CXX">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -282,6 +304,14 @@ CIM_FileSystem
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">

diff --git a/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/GetDirInstance10002rspgood.xml b/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/GetDirInstance10002rspgood.xml
index bd8a82d199f83054c6ff48ead8fb429cb34dff0b..1602d4f89953246971d0ab3ea10fbdb1c08915fa 100644 (file)
--- a/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/GetDirInstance10002rspgood.xml
+++ b/src/Providers/sample/CMPI/FilesAndDirectories_CXX/tests/GetDirInstance10002rspgood.xml
@@ -5,6 +5,8 @@
 <IMETHODRESPONSE NAME="GetInstance">
 <IRETURNVALUE>
 <INSTANCE CLASSNAME="CWS_Directory_CXX">
+<PROPERTY NAME="InstanceID" TYPE="string">
+</PROPERTY>
 <PROPERTY NAME="Caption" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="Description" TYPE="string">
@@ -21,6 +23,14 @@
 </PROPERTY>
 <PROPERTY NAME="HealthState" TYPE="uint16">
 </PROPERTY>
+<PROPERTY NAME="CommunicationStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="DetailedStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="OperatingStatus" TYPE="uint16">
+</PROPERTY>
+<PROPERTY NAME="PrimaryStatus" TYPE="uint16">
+</PROPERTY>
 <PROPERTY NAME="CompressionMethod" TYPE="string">
 </PROPERTY>
 <PROPERTY NAME="EncryptionMethod" TYPE="string">

diff --git a/src/SDK/samples/mak/SDKEnvVar.mak b/src/SDK/samples/mak/SDKEnvVar.mak
index b1e8eaf24bc2071cccf63d75439fdea49605200e..42f3f6b6d866ab27c9b15d1e8cc92626fe0125da 100644 (file)
--- a/src/SDK/samples/mak/SDKEnvVar.mak
+++ b/src/SDK/samples/mak/SDKEnvVar.mak
@@ -60,6 +60,6 @@ ifndef PEGASUS_INCLUDE_DIR
     PEGASUS_INCLUDE_DIR=$(PEGASUS_ROOT)/src
 endif
 ifndef PEGASUS_CIM_SCHEMA_DIR
-    PEGASUS_CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM217
+    PEGASUS_CIM_SCHEMA_DIR=$(PEGASUS_ROOT)/Schemas/CIM222
     CIM_SCHEMA_VER=
 endif