1.1 --- a/ChangeLog	Wed May 23 12:47:39 2007 -0600
     1.2 +++ b/ChangeLog	Wed May 23 13:15:12 2007 -0600
     1.3 @@ -1,3 +1,12 @@
     1.4 +-------------------------------------------------------------------
     1.5 +Wed May 23 13:11:53 MDT 2007 - jfehlig@novell.com
     1.6 +
     1.7 +        - Renamed some of the recently introduced test input files
     1.8 +          to better reflect their purpose.
     1.9 +        - Removed Xen_RunningOS from list of association providers
    1.10 +          that are tested.  This association (and Xen_OperatingSystem)
    1.11 +          have been removed from the project.
    1.12 +
    1.13  -------------------------------------------------------------------
    1.14  Wed May 23 12:46:16 MDT 2007 - jfehlig@novell.com
    1.15  

     2.1 --- a/test/README	Wed May 23 12:47:39 2007 -0600
     2.2 +++ b/test/README	Wed May 23 13:15:12 2007 -0600
     2.3 @@ -36,9 +36,11 @@ Run the setup-test script at the beginni
     2.4  write access to the directory containing sblim-testsuite.
     2.5  
     2.6  If at any point you wish to add or remove a provider for testing, simply 
     2.7 -update the provider_list and it will automatically be included in the testing.
     2.8 +update either instance_provider_list or association_provider_list (depending
     2.9 +on provider type) and it will automatically be included in the testing.
    2.10  
    2.11  5.  RUNNING
    2.12  
    2.13 -Run the run-test.sh script.  The results are in the file called 'results'
    2.14 -
    2.15 +Run the run-test.sh script.  Instance provider test results are placed in
    2.16 +the file 'instance_provider_results'.  Association provider test results
    2.17 +are placed in 'association_provider_results'.

     3.1 --- a/test/association_list	Wed May 23 12:47:39 2007 -0600
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,36 +0,0 @@
     3.4 -Xen_ProcessorSettingsDefineState
     3.5 -Xen_HasVirtualizationCapabilities
     3.6 -Xen_ComputerSystemConsole
     3.7 -Xen_NetworkPortElementSettingData
     3.8 -Xen_HostedComputerSystem
     3.9 -Xen_ComputerSystemMemory
    3.10 -Xen_DiskSettingsDefineState
    3.11 -Xen_CSSettingDataComponent
    3.12 -Xen_ElementConformsToSVProfile
    3.13 -Xen_RunningOS
    3.14 -Xen_ComputerSystemProcessor
    3.15 -Xen_MemoryAllocatedFromPool
    3.16 -Xen_MemorySettingsDefineState
    3.17 -Xen_HostedVirtualSystemManagementService
    3.18 -Xen_ComputerSystemDisk
    3.19 -Xen_DiskElementSettingData
    3.20 -Xen_ProcessorSettingAllocationFromPool
    3.21 -Xen_NPSettingsDefineState
    3.22 -Xen_CSElementSettingData
    3.23 -Xen_HostedNetworkPort
    3.24 -Xen_CSElementCapabilities
    3.25 -Xen_HostedProcessor
    3.26 -Xen_MemoryElementSettingData
    3.27 -Xen_ElementConformsToVSProfile
    3.28 -Xen_CSSettingsDefineState
    3.29 -Xen_ComputerSystemNetworkPort
    3.30 -Xen_HostedMemory
    3.31 -Xen_MemorySettingAllocationFromPool
    3.32 -Xen_ProcessorAllocatedFromPool
    3.33 -Xen_MemoryPoolComponent
    3.34 -Xen_HostedDisk
    3.35 -Xen_ProcessorPoolComponent
    3.36 -Xen_HostedMemoryPool
    3.37 -Xen_ProcessorElementSettingData
    3.38 -Xen_HostedProcessorPool
    3.39 -Xen_VSMSElementCapabilities

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/test/association_provider_list	Wed May 23 13:15:12 2007 -0600
     4.3 @@ -0,0 +1,35 @@
     4.4 +Xen_ProcessorSettingsDefineState
     4.5 +Xen_HasVirtualizationCapabilities
     4.6 +Xen_ComputerSystemConsole
     4.7 +Xen_NetworkPortElementSettingData
     4.8 +Xen_HostedComputerSystem
     4.9 +Xen_ComputerSystemMemory
    4.10 +Xen_DiskSettingsDefineState
    4.11 +Xen_CSSettingDataComponent
    4.12 +Xen_ElementConformsToSVProfile
    4.13 +Xen_ComputerSystemProcessor
    4.14 +Xen_MemoryAllocatedFromPool
    4.15 +Xen_MemorySettingsDefineState
    4.16 +Xen_HostedVirtualSystemManagementService
    4.17 +Xen_ComputerSystemDisk
    4.18 +Xen_DiskElementSettingData
    4.19 +Xen_ProcessorSettingAllocationFromPool
    4.20 +Xen_NPSettingsDefineState
    4.21 +Xen_CSElementSettingData
    4.22 +Xen_HostedNetworkPort
    4.23 +Xen_CSElementCapabilities
    4.24 +Xen_HostedProcessor
    4.25 +Xen_MemoryElementSettingData
    4.26 +Xen_ElementConformsToVSProfile
    4.27 +Xen_CSSettingsDefineState
    4.28 +Xen_ComputerSystemNetworkPort
    4.29 +Xen_HostedMemory
    4.30 +Xen_MemorySettingAllocationFromPool
    4.31 +Xen_ProcessorAllocatedFromPool
    4.32 +Xen_MemoryPoolComponent
    4.33 +Xen_HostedDisk
    4.34 +Xen_ProcessorPoolComponent
    4.35 +Xen_HostedMemoryPool
    4.36 +Xen_ProcessorElementSettingData
    4.37 +Xen_HostedProcessorPool
    4.38 +Xen_VSMSElementCapabilities

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/test/association_provider_template	Wed May 23 13:15:12 2007 -0600
     5.3 @@ -0,0 +1,19 @@
     5.4 +********************************************************************************
     5.5 +association : ASDF
     5.6 +sourceRole : LHS_ROLE
     5.7 +targetRole : RHS_ROLE
     5.8 +sourceClass : LHS_CLASS
     5.9 +targetClass : RHS_CLASS
    5.10 +
    5.11 +--------------------------------------------------------------------------------
    5.12 +Association                                                          associators
    5.13 +
    5.14 +--------------------------------------------------------------------------------
    5.15 +Association                                                      associatorNames
    5.16 +
    5.17 +--------------------------------------------------------------------------------
    5.18 +Association                                                           references
    5.19 +
    5.20 +--------------------------------------------------------------------------------
    5.21 +Association                                                       referenceNames
    5.22 +

     6.1 --- a/test/association_template	Wed May 23 12:47:39 2007 -0600
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,19 +0,0 @@
     6.4 -********************************************************************************
     6.5 -association : ASDF
     6.6 -sourceRole : LHS_ROLE
     6.7 -targetRole : RHS_ROLE
     6.8 -sourceClass : LHS_CLASS
     6.9 -targetClass : RHS_CLASS
    6.10 -
    6.11 ---------------------------------------------------------------------------------
    6.12 -Association                                                          associators
    6.13 -
    6.14 ---------------------------------------------------------------------------------
    6.15 -Association                                                      associatorNames
    6.16 -
    6.17 ---------------------------------------------------------------------------------
    6.18 -Association                                                           references
    6.19 -
    6.20 ---------------------------------------------------------------------------------
    6.21 -Association                                                       referenceNames
    6.22 -

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/test/instance_provider_list	Wed May 23 13:15:12 2007 -0600
     7.3 @@ -0,0 +1,22 @@
     7.4 +Xen_RegisteredSVProfile
     7.5 +Xen_RegisteredVSProfile
     7.6 +Xen_VirtualSystemManagementService
     7.7 +Xen_VirtualSystemManagementCapabilities
     7.8 +Xen_ComputerSystem
     7.9 +Xen_ComputerSystemSettingData
    7.10 +Xen_ComputerSystemCapabilities
    7.11 +Xen_VirtualizationCapabilities
    7.12 +Xen_Disk
    7.13 +Xen_DiskSettingData
    7.14 +Xen_Memory
    7.15 +Xen_MemorySettingData
    7.16 +Xen_MemoryCapabilitiesSettingData
    7.17 +Xen_Processor
    7.18 +Xen_ProcessorSettingData
    7.19 +Xen_ProcessorCapabilitiesSettingData
    7.20 +Xen_Console
    7.21 +Xen_ConsoleSettingData
    7.22 +Xen_NetworkPortSettingData
    7.23 +Xen_NetworkPort
    7.24 +Xen_MemoryPool
    7.25 +Xen_ProcessorPool

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/test/instance_provider_template	Wed May 23 13:15:12 2007 -0600
     8.3 @@ -0,0 +1,13 @@
     8.4 +********************************************************************************
     8.5 +class : ASDF
     8.6 +objectPath : 
     8.7 +		
     8.8 +--------------------------------------------------------------------------------
     8.9 +Instance                                                       enumInstanceNames
    8.10 +
    8.11 +--------------------------------------------------------------------------------
    8.12 +Instance                                                           enumInstances
    8.13 +
    8.14 +--------------------------------------------------------------------------------
    8.15 +Instance                                                                     get
    8.16 +

     9.1 --- a/test/provider_list	Wed May 23 12:47:39 2007 -0600
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,22 +0,0 @@
     9.4 -Xen_RegisteredSVProfile
     9.5 -Xen_RegisteredVSProfile
     9.6 -Xen_VirtualSystemManagementService
     9.7 -Xen_VirtualSystemManagementCapabilities
     9.8 -Xen_ComputerSystem
     9.9 -Xen_ComputerSystemSettingData
    9.10 -Xen_ComputerSystemCapabilities
    9.11 -Xen_VirtualizationCapabilities
    9.12 -Xen_Disk
    9.13 -Xen_DiskSettingData
    9.14 -Xen_Memory
    9.15 -Xen_MemorySettingData
    9.16 -Xen_MemoryCapabilitiesSettingData
    9.17 -Xen_Processor
    9.18 -Xen_ProcessorSettingData
    9.19 -Xen_ProcessorCapabilitiesSettingData
    9.20 -Xen_Console
    9.21 -Xen_ConsoleSettingData
    9.22 -Xen_NetworkPortSettingData
    9.23 -Xen_NetworkPort
    9.24 -Xen_MemoryPool
    9.25 -Xen_ProcessorPool

    10.1 --- a/test/provider_template	Wed May 23 12:47:39 2007 -0600
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,13 +0,0 @@
    10.4 -********************************************************************************
    10.5 -class : ASDF
    10.6 -objectPath : 
    10.7 -		
    10.8 ---------------------------------------------------------------------------------
    10.9 -Instance                                                       enumInstanceNames
   10.10 -
   10.11 ---------------------------------------------------------------------------------
   10.12 -Instance                                                           enumInstances
   10.13 -
   10.14 ---------------------------------------------------------------------------------
   10.15 -Instance                                                                     get
   10.16 -

    11.1 --- a/test/run-test.sh	Wed May 23 12:47:39 2007 -0600
    11.2 +++ b/test/run-test.sh	Wed May 23 13:15:12 2007 -0600
    11.3 @@ -20,33 +20,33 @@
    11.4  # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    11.5  #
    11.6  
    11.7 -cp provider_list sblim-test-suite/provider_list
    11.8 +cp instance_provider_list sblim-test-suite/instance_provider_list
    11.9  CMPI_TEST_PATH=`pwd`
   11.10  cd sblim-test-suite
   11.11  
   11.12 -echo 'Starting provider tests ...'
   11.13 +echo 'Starting instance provider tests ...'
   11.14  
   11.15 -cat provider_list |   \
   11.16 +cat instance_provider_list |   \
   11.17  while read line
   11.18  do
   11.19  	echo Starting $line test ...
   11.20 -	./run.sh $line >> $CMPI_TEST_PATH/provider_results 2>/dev/null
   11.21 +	./run.sh $line >> $CMPI_TEST_PATH/instance_provider_results 2>/dev/null
   11.22  done
   11.23  
   11.24 -echo 'Done provider tests.  Results are in file provider_results.'
   11.25 +echo 'Done executing instance provider tests.  Results are in file instance_provider_results.'
   11.26  echo '-----------------------------------------------------------'
   11.27 -rm provider_list
   11.28 +rm instance_provider_list
   11.29  cd ..
   11.30  
   11.31 -echo 'Starting association tests ...'
   11.32 -cp association_list sblim-test-suite/association_list
   11.33 +echo 'Starting association provider tests ...'
   11.34 +cp association_provider_list sblim-test-suite/association_provider_list
   11.35  cd sblim-test-suite
   11.36 -cat association_list |   \
   11.37 +cat association_provider_list |   \
   11.38  while read line
   11.39  do
   11.40  	echo Starting $line test ...
   11.41 -	./run.sh $line >> $CMPI_TEST_PATH/association_results 2>/dev/null
   11.42 +	./run.sh $line >> $CMPI_TEST_PATH/association_provider_results 2>/dev/null
   11.43  done 
   11.44  
   11.45 -echo 'Done. Results are in file association_results.'
   11.46 -rm association_list
   11.47 +echo 'Done. Results are in file association_provider_results.'
   11.48 +rm association_provider_list

    12.1 --- a/test/setup-test.sh	Wed May 23 12:47:39 2007 -0600
    12.2 +++ b/test/setup-test.sh	Wed May 23 13:15:12 2007 -0600
    12.3 @@ -54,38 +54,38 @@ else
    12.4  fi
    12.5  
    12.6  
    12.7 -# Read provider list, make provider_name.cim file from template, 
    12.8 +# Read instance provider list, make provider_name.cim file from template, 
    12.9  # and replace 'ASDF' with provider name
   12.10  
   12.11 -cp provider_list sblim-test-suite/provider_list
   12.12 -cp provider_template sblim-test-suite/cim
   12.13 +cp instance_provider_list sblim-test-suite/instance_provider_list
   12.14 +cp instance_provider_template sblim-test-suite/cim
   12.15  cd sblim-test-suite/cim
   12.16 -cat ../provider_list |   \
   12.17 +cat ../instance_provider_list |   \
   12.18  while read line
   12.19  do
   12.20  	text_file=$line.cim
   12.21 -	cp provider_template $text_file
   12.22 +	cp instance_provider_template $text_file
   12.23  	sed -e 's/ASDF/'$line'/g' $text_file > temp
   12.24  	mv -f temp $text_file
   12.25  done
   12.26  
   12.27 -rm ../provider_list
   12.28 -rm provider_template
   12.29 +rm ../instance_provider_list
   12.30 +rm instance_provider_template
   12.31  cd ../..
   12.32  
   12.33 -# Read provider list, make association_name.cim file from template, 
   12.34 -# and replace 'ASDF' with association name.  Also, harvest classes 
   12.35 -# and roles on both sides of the association from .mof files and
   12.36 -# put them into the association_name.cim file.
   12.37 +# Read association provider list, make association_name.cim file from
   12.38 +# template, and replace 'ASDF' with association name.  Also, harvest
   12.39 +# classes and roles on both sides of the association from .mof files
   12.40 +# and put them into the association_name.cim file.
   12.41  
   12.42 -cp association_list sblim-test-suite/association_list
   12.43 -cp association_template sblim-test-suite/cim
   12.44 +cp association_provider_list sblim-test-suite/association_provider_list
   12.45 +cp association_provider_template sblim-test-suite/cim
   12.46  cd sblim-test-suite/cim
   12.47 -cat ../association_list |   \
   12.48 +cat ../association_provider_list |   \
   12.49  while read line
   12.50  do
   12.51  	text_file=$line.cim
   12.52 -	cp association_template $text_file
   12.53 +	cp association_provider_template $text_file
   12.54  	sed -e 's/ASDF/'$line'/g' $text_file > temp
   12.55  	mv -f temp $text_file
   12.56  
   12.57 @@ -110,7 +110,7 @@ do
   12.58  	mv -f temp $text_file
   12.59  done
   12.60  
   12.61 -rm ../association_list
   12.62 -rm association_template
   12.63 +rm ../association_provider_list
   12.64 +rm association_provider_template
   12.65  
   12.66  echo 'Done.'