Rename vmprovider to serverprovider module

As in future we are going to provide not only VMs but also
baremetal nodes, so it will be better to use more common name
like serverprovider then vmprovider.

Change-Id: Ic7c5aed88d026748fe1944cc7d59d33372c42b51

rally/serverprovider/__init__.py

@@ -15,8 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally.vmprovider.provider import *  # noqa
+from rally.serverprovider.provider import *  # noqa
 from rally import utils
 
 
-utils.import_modules_from_package('rally.vmprovider.providers')
+utils.import_modules_from_package('rally.serverprovider.providers')

rally/serverprovider/__main__.py

@@ -15,4 +15,4 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from rally import vmprovider  # noqa
+from rally import serverprovider  # noqa

rally/serverprovider/provider.py

@@ -21,8 +21,8 @@ from rally import exceptions
 from rally import utils
 
 
-class VMProviderFactory(object):
-    """rally.vmprovider.provider.VMProviderFactory is base class for providers
+class ProviderFactory(object):
+    """ProviderFactory should be base class for all providers.
 
     All provider should be added to rally.vmprovider.providers.some_moduule.py
     and implement 4 methods:
@@ -36,7 +36,7 @@ class VMProviderFactory(object):
     @staticmethod
     def get_provider(name, config):
         """Returns instance of vm provider by name."""
-        for provider in utils.itersubclasses(VMProviderFactory):
+        for provider in utils.itersubclasses(ProviderFactory):
             if name == provider.__name__:
                 return provider(config)
         raise exceptions.NoSuchVMProvider(vm_provider_name=name)
@@ -44,7 +44,7 @@ class VMProviderFactory(object):
     @staticmethod
     def get_available_providers():
         """Returns list of names of available engines."""
-        return [e.__name__ for e in utils.itersubclasses(VMProviderFactory)]
+        return [e.__name__ for e in utils.itersubclasses(ProviderFactory)]
 
     def upload_image(self, image):
         """Upload image that could be used in creating new vms.

tests/serverprovider/test_provider.py

@@ -18,16 +18,18 @@
 """Test for vm providers."""
 
 from rally import exceptions
+from rally import serverprovider
 from rally import test
-from rally import vmprovider
 
 
-class VMProviderTestCase(test.NoDBTestCase):
+ProviderFactory = serverprovider.ProviderFactory
+
+
+class ProviderTestCase(test.NoDBTestCase):
 
     def test_get_provider_not_found(self):
         self.assertRaises(exceptions.NoSuchVMProvider,
-                          vmprovider.VMProviderFactory.get_provider,
-                          "non_existing", None)
+                          ProviderFactory.get_provider, "non_existing", None)
 
     def _create_fake_providers(self):
         class ProviderMixIn(object):
@@ -37,11 +39,11 @@ class VMProviderTestCase(test.NoDBTestCase):
             def destroy_vms(self, vm_uuids):
                 pass
 
-        class ProviderA(ProviderMixIn, vmprovider.VMProviderFactory):
+        class ProviderA(ProviderMixIn, ProviderFactory):
             def __init__(self, config):
                 pass
 
-        class ProviderB(ProviderMixIn, vmprovider.VMProviderFactory):
+        class ProviderB(ProviderMixIn, ProviderFactory):
             def __init__(self, config):
                 pass
 
@@ -53,19 +55,17 @@ class VMProviderTestCase(test.NoDBTestCase):
 
     def test_get_provider(self):
         for p in self._create_fake_providers():
-                p_inst = vmprovider.VMProviderFactory.get_provider(p.__name__,
-                                                                   None)
+                p_inst = ProviderFactory.get_provider(p.__name__, None)
                 # TODO(boris-42): make it work through assertIsInstance
                 self.assertEqual(str(type(p_inst)), str(p))
 
     def test_get_available_providers(self):
         providers = set([p.__name__ for p in self._create_fake_providers()])
-        real_providers = \
-            set(vmprovider.VMProviderFactory.get_available_providers())
+        real_providers = set(ProviderFactory.get_available_providers())
         self.assertEqual(providers & real_providers, providers)
 
     def test_vm_prvoider_factory_is_abstract(self):
-        self.assertRaises(TypeError, vmprovider.VMProviderFactory)
+        self.assertRaises(TypeError, ProviderFactory)
 
     def test_image_methods_raise_not_implemented(self):
         provider = self._create_fake_providers()[0](None)