Github user jburwell commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1615#discussion_r80700964
--- Diff: test/integration/smoke/test_ssvm.py ---
@@ -1197,3 +1205,148 @@ def test_10_destroy_cpvm(self):
# Call to verify cloud process is running
self.test_04_cpvm_internals()
return
+
+ @attr(
+ tags=[
+ "advanced",
+ "advancedns",
+ "smoke",
+ "basic",
+ "sg"],
+ required_hardware="true")
+ def test_11_ss_nfs_version_on_ssvm(self):
+ """Test NFS Version on Secondary Storage mounted properly on SSVM
+ """
+
+ # 1) List SSVM in zone
+ # 2) Get id and url from mounted nfs store
+ # 3) Update NFS version for previous image store
+ # 4) Stop SSVM
+ # 5) Check NFS version of mounted nfs store after SSVM starts
+
+ nfs_version = self.config.nfsVersion
+ if nfs_version == None:
+ self.skipTest('No NFS version provided in test data')
+
+ #List SSVM for zone id
+ list_ssvm_response = list_ssvms(
+ self.apiclient,
+ systemvmtype='secondarystoragevm',
+ state='Running',
+ zoneid=self.zone.id
+ )
+ self.assertEqual(
+ isinstance(list_ssvm_response, list),
+ True,
+ "Check list response returns a valid list"
+ )
+ self.assertEqual(
+ len(list_ssvm_response),
+ 1,
+ "Check list System VMs response"
+ )
+
+ ssvm = list_ssvm_response[0]
+ image_stores_response =
ImageStore.list(self.apiclient,zoneid=self.zone.id)
+
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
+ # SSH into SSVMs is done via management server for Vmware and
Hyper-V
+ result = get_process_status(
+ self.apiclient.connection.mgtSvr,
+ 22,
+ self.apiclient.connection.user,
+ self.apiclient.connection.passwd,
+ ssvm.privateip,
+ "mount | grep 'type nfs'",
+ hypervisor=self.hypervisor)
+
+ for res in result:
+ split_res = res.split(" on ")
+ mounted_img_store_url = split_res[0]
+ for img_store in image_stores_response:
+ img_store_url = str(img_store.url)
+ if img_store_url.startswith("nfs://"):
+ img_store_url = img_store_url[6:]
+ #Add colon after ip address to match output from mount
command
+ first_slash = img_store_url.find('/')
+ img_store_url = img_store_url[0:first_slash] + ':' +
img_store_url[first_slash:]
+ if img_store_url == mounted_img_store_url:
+ img_store_id = img_store.id
+ break
+
+ self.assertNotEqual(
+ img_store_id,
+ None,
+ "Check image store id mounted on SSVM"
+ )
+
+ #Update NFS version for image store mounted on SSVM
+ updateConfigurationCmd =
updateConfiguration.updateConfigurationCmd()
+ updateConfigurationCmd.name = "secstorage.nfs.version"
+ updateConfigurationCmd.value = nfs_version
+ updateConfigurationCmd.imagestoreuuid = img_store_id
+
+ updateConfigurationResponse =
self.apiclient.updateConfiguration(updateConfigurationCmd)
+ self.logger.debug("updated the parameter %s with value
%s"%(updateConfigurationResponse.name, updateConfigurationResponse.value))
+
+ #Stop SSVM
+ self.debug("Stopping SSVM: %s" % ssvm.id)
+ cmd = stopSystemVm.stopSystemVmCmd()
+ cmd.id = ssvm.id
+ self.apiclient.stopSystemVm(cmd)
+
+ timeout = self.services["timeout"]
+ while True:
+ list_ssvm_response = list_ssvms(
+ self.apiclient,
+ id=ssvm.id
+ )
+ if isinstance(list_ssvm_response, list):
+ if list_ssvm_response[0].state == 'Running':
+ break
+ if timeout == 0:
+ raise Exception("List SSVM call failed!")
+
+ time.sleep(self.services["sleep"])
+ timeout = timeout - 1
--- End diff --
Please consider replacing this `while` loop (lines 1299-1311) with
`utils.waitUntil` as it provides a Pythonic/tested implementation of waiting
for a condition to complete. It would also clarify the intent of this section.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
