Updates to reflect changes in test folder structure and naming

README.md

@@ -61,9 +61,9 @@ The installation script is here:
 using the following convention:
 
 * Tests are written in python using pytest
-* Related tests are stored in a python module `test/<testmodule>` to create a suite of tests. All tests are stored in files test_*.py, there can be many tests per file, and many files per module
+* Related tests are stored in a python module `clmctest/<testmodule>` to create a suite of tests. All tests are stored in files test_*.py, there can be many tests per file, and many files per module
 * Each test module has a rspec.yml that provides the baseline "fixture" for the tests in the module
-* Tests are executed against fixtures. Fixtures are modular "setups" created for a test, that are inserted into the python code using dependancy injection. This offers more flexibility than the *unit style testing. The baseline deployment is created using `vagrant up` with an appropriate rspec, and the pytest fixture reads the rspec.yml and makes the configuration available to the test.
+* Tests are executed against fixtures. Fixtures are modular "setups" created for a test, that are inserted into the python code using dependancy injection. This offers more flexibility than the unit style testing. The baseline deployment is created using `vagrant up` with an appropriate rspec, and the pytest fixture reads the rspec.yml and makes the configuration available to the test.
 * Tests are executed from a guest VM (not the host) in the repo root using the command `pytest test/<testmodule>`
 * Pytest will scan the directory for all tests including in files test_*.py and run them
 
@@ -75,7 +75,7 @@ To set up a simulation of the adaptive streaming use case scenario first install
 
 and then execute the following command
 
-`vagrant --fixture=streaming-sim -- up`
+`vagrant --fixture=monitoring -- up`
 
 This will provision the following VMs clmc-service, ipendpoint1, ipendpoint2
 
@@ -89,7 +89,7 @@ The **clmc-service** vm includes influx, Kapacitor and Chronograf. The following
 
 SSH into the CLMC server
 
-`vagrant --fixture=streaming-sim -- ssh clmc-service`
+`vagrant --fixture=monitoring -- ssh clmc-service`
 
 Then go to the 'vagrant' directory.
 
@@ -99,20 +99,19 @@ The next step is to generate the test data, which could be done in two ways.
 
 First option is to run a python script to generate the test data sets
 
-`python3 test/streaming-sim/StreamingSim.py`
+`python3 clmctest/monitoring/StreamingSim.py`
 
 This script could also be used to clear the generated data by using the '-c' option
 
-`python3 test/streaming-sim/StreamingSim.py -c`
+`python3 clmctest/monitoring/StreamingSim.py -c`
 
-The second option is to directly run the testing module, which will detect if the data was generated, and if not, will automatically
-generate the data before executing the tests. Keep in mind that if the test data is being generated using this way, a 10 seconds timeout 
-is given after the generation is finished so that the data could properly be inserted into the database. If the data was already generated 
-using the first option, only the tests would be executed.
+#### Running the monitoring tests
 
-The command for running the testing module is
+The second option is to directly run the testing module, which will detect if the data was generated, and if not, will automatically generate the data before executing the tests. Keep in mind that if the test data is being generated using this way, a 10 seconds timeout is given after the generation is finished so that the data could properly be inserted into the database. If the data was already generated using the first option, only the tests would be executed.
 
-`pytest -s test/streaming-sim/test_simresults.py`
+The command for running the testing module is:
+
+`pytest -s clmctest/monitoring/test_simresults.py`
 
 The `-s` option in the command is used to output prints used in the test code and is, therefore, optional.