Merge pull request #881 from QualiSystems/develop

Merging dev to master for 1.8.1 release
QualiSystems · Aug 8, 2017 · fc9f174 · fc9f174
2 parents 47d3df7 + 8742b36
commit fc9f174
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 10 deletions.
diff --git a/PackInstall.bat b/PackInstall.bat
@@ -1,3 +1,3 @@
 @echo off
-run_packager.bat
+call run_packager.bat
 python -m qpm install --package_name vCenterShell
diff --git a/package/cloudshell/cp/vcenter/commands/power_manager_vm.py b/package/cloudshell/cp/vcenter/commands/power_manager_vm.py
@@ -30,7 +30,7 @@ def power_off(self, si, logger, session, vcenter_data_model, vm_uuid, resource_f
 
         if vm.summary.runtime.powerState == 'poweredOff':
             logger.info('vm already powered off')
-            task_result = 'already powered off'
+            task_result = 'Already powered off'
         else:
             # hard power off
             logger.info('{0} powering of vm'.format(vcenter_data_model.shutdown_method))
@@ -72,7 +72,7 @@ def power_on(self, si, logger, session, vm_uuid, resource_fullname):
 
         if vm.summary.runtime.powerState == 'poweredOn':
             logger.info('vm already powered on')
-            task_result = 'already powered on'
+            task_result = 'Already powered on'
         else:
             logger.info('powering on vm')
             task = vm.PowerOn()

diff --git a/package/cloudshell/cp/vcenter/common/utilites/command_result.py b/package/cloudshell/cp/vcenter/common/utilites/command_result.py
@@ -26,6 +26,9 @@ def set_command_result(result, unpicklable=False):
     if result is None:
         return
 
+    if isinstance(result, basestring):
+        return result
+
     json = jsonpickle.encode(result, unpicklable=unpicklable)
     result_for_output = str(json)
     print result_for_output

diff --git a/package/cloudshell/tests/test_commands/test_power_management_vm.py b/package/cloudshell/tests/test_commands/test_power_management_vm.py
@@ -27,7 +27,7 @@ def test_power_off_already(self):
                                       resource_fullname=None)
 
         # assert
-        self.assertTrue(res, 'already powered off')
+        self.assertTrue(res, 'Already powered off')
         self.assertFalse(vm.PowerOn.called)
 
     def test_power_on_already(self):
@@ -51,7 +51,7 @@ def test_power_on_already(self):
                                      resource_fullname=None)
 
         # assert
-        self.assertTrue(res, 'already powered on')
+        self.assertTrue(res, 'Already powered on')
         self.assertFalse(vm.PowerOn.called)
 
     def test_power_on(self):

diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.8.0
+1.8.1
diff --git a/run_packager.bat b/run_packager.bat
@@ -1,4 +1,4 @@
 @echo off
 python -m pip install qpm --no-cache-dir --upgrade
 python -m qpm pack --package_name vCenterShell
-copy version.txt package/version.txt
+copy version.txt package/version.txt /Y
diff --git a/vCenterShellPackage/DataModel/datamodel.xml b/vCenterShellPackage/DataModel/datamodel.xml
@@ -172,7 +172,7 @@
     </ns0:AttributeInfo>
   </ns0:Attributes>
   <ns0:ResourceFamilies>
-    <ns0:ResourceFamily Description="" IsAdminOnly="true" IsSearchable="true" Name="Cloud Provider" AllowRemoteConnection="false">
+    <ns0:ResourceFamily Description="" IsAdminOnly="true" IsSearchable="false" Name="Cloud Provider" AllowRemoteConnection="false">
       <ns0:AttachedAttributes />
       <ns0:AttributeValues />
       <ns0:Models>

diff --git a/vcentershell_driver/drivermetadata.xml b/vcentershell_driver/drivermetadata.xml
@@ -1,4 +1,4 @@
-<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.8.0">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.8.1">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-1.8.0
+1.8.1