diff --git a/samples/vmc/draas/activate_srm_ops.py b/samples/vmc/draas/activate_srm_ops.py index 2b6b36bf..da848051 100644 --- a/samples/vmc/draas/activate_srm_ops.py +++ b/samples/vmc/draas/activate_srm_ops.py @@ -17,7 +17,6 @@ __author__ = 'VMware, Inc.' import time from samples.vmc.helpers.sample_cli import parser, optional_args -from vmware.vapi.vmc.vmc_draas_client import create_vmc_draas_client from vmware.vapi.vmc.client import create_vmc_client @@ -45,7 +44,6 @@ class SrmActivationOperations(object): self.cleanup = args.cleardata self.vmc_client = create_vmc_client(refresh_token=args.refresh_token) - self.draas_client = create_vmc_draas_client(refresh_token=args.refresh_token) def setup(self): # Check if the organization exists @@ -61,8 +59,8 @@ class SrmActivationOperations(object): # Activate SRM Addon in a SDDC def activate_srm(self): - if self.draas_client.SiteRecovery.get(self.org_id, self.sddc_id).site_recovery_state != "ACTIVATED": - srm_activation = self.draas_client.SiteRecovery.post(self.org_id, + if self.vmc_client.draas.SiteRecovery.get(self.org_id, self.sddc_id).site_recovery_state != "ACTIVATED": + srm_activation = self.vmc_client.draas.SiteRecovery.post(self.org_id, self.sddc_id, activate_site_recovery_config=None) print("Activation of SRM {} : {}".format(srm_activation.status, @@ -79,7 +77,7 @@ class SrmActivationOperations(object): timeout = time.time() + self.max_wait_time while time.time() < timeout: time.sleep(self.query_wait_time) - status = self.draas_client.SiteRecovery.get(self.org_id, self.sddc_id) + status = self.vmc_client.draas.SiteRecovery.get(self.org_id, self.sddc_id) if status.site_recovery_state in ['ACTIVATED', 'DEACTIVATED', 'CANCELLED', 'FAILED']: print("Site Recovery (DRaaS) Activation Status in {} : {}" .format(status.updated, status.site_recovery_state)) @@ -95,7 +93,7 @@ class SrmActivationOperations(object): def deactivate_srm(self): if self.cleanup: print("Deactivating SRM") - self.draas_client.SiteRecovery.delete(self.org_id, + self.vmc_client.draas.SiteRecovery.delete(self.org_id, self.sddc_id, force=True) self.query_activation_status() diff --git a/samples/vmc/draas/deploy_additional_node.py b/samples/vmc/draas/deploy_additional_node.py index 530f22f4..8666ae2f 100644 --- a/samples/vmc/draas/deploy_additional_node.py +++ b/samples/vmc/draas/deploy_additional_node.py @@ -17,7 +17,6 @@ __author__ = 'VMware, Inc.' import time from samples.vmc.helpers.sample_cli import parser, optional_args -from vmware.vapi.vmc.vmc_draas_client import create_vmc_draas_client from vmware.vapi.vmc.client import create_vmc_client from com.vmware.vmc.draas.model_client import ProvisionSrmConfig @@ -46,7 +45,6 @@ class DeployAdditionalNode(object): self.cleanup = args.cleardata self.vmc_client = create_vmc_client(refresh_token=args.refresh_token) - self.draas_client = create_vmc_draas_client(refresh_token=args.refresh_token) def setup(self): # Check if the organization exists @@ -61,13 +59,13 @@ class DeployAdditionalNode(object): format(self.sddc_id, self.org_id)) # Check if the SRM Add-on is activated in VMC - if "ACTIVATED" != self.draas_client.SiteRecovery.get(self.org_id, self.sddc_id).site_recovery_state: + if "ACTIVATED" != self.vmc_client.draas.SiteRecovery.get(self.org_id, self.sddc_id).site_recovery_state: raise ValueError("DRaaS is not activated in SDDC with ID {} & org with ID {}". format(self.sddc_id, self.org_id)) # Deploy Additional SRM Node def deploy_srm(self): - deploy_srm = self.draas_client.SiteRecoverySrmNodes.post( + deploy_srm = self.vmc_client.draas.SiteRecoverySrmNodes.post( self.org_id, self.sddc_id, ProvisionSrmConfig(srm_extension_key_suffix=self.node_extension_id)) @@ -79,12 +77,12 @@ class DeployAdditionalNode(object): Hence querying the SRM activation status with resource_id and state for the status. ''' def query_deployment(self, deployed_node_id): - srm_node_details = self.draas_client.SiteRecovery.get(self.org_id, self.sddc_id).srm_nodes + srm_node_details = self.vmc_client.draas.SiteRecovery.get(self.org_id, self.sddc_id).srm_nodes for node_index in range(len(srm_node_details)): if deployed_node_id == srm_node_details[node_index].id: timeout = time.time() + self.max_wait_time while time.time() < timeout: - node_details = self.draas_client.SiteRecovery.get(self.org_id, self.sddc_id) + node_details = self.vmc_client.draas.SiteRecovery.get(self.org_id, self.sddc_id) time.sleep(self.wait_time) if node_details.srm_nodes[node_index].state in ['READY', 'DELETING', 'CANCELLED', 'FAILED']: print("Site Recovery (DRaaS) Additonal Node Deployment Status {} : {}" @@ -104,7 +102,7 @@ class DeployAdditionalNode(object): def delete_node(self, node_id): if self.cleanup: print("Removing the Additional Node") - self.draas_client.SiteRecoverySrmNodes.delete( + self.vmc_client.draas.SiteRecoverySrmNodes.delete( self.org_id, self.sddc_id, node_id) diff --git a/samples/vmc/draas/get_srm_info.py b/samples/vmc/draas/get_srm_info.py index 2e7c5640..4fb10844 100644 --- a/samples/vmc/draas/get_srm_info.py +++ b/samples/vmc/draas/get_srm_info.py @@ -1,8 +1,7 @@ import argparse import requests -from vmware.vapi.vmc.vmc_draas_client import create_vmc_draas_client - +from vmware.vapi.vmc.client import create_vmc_client parser = argparse.ArgumentParser() parser.add_argument( @@ -25,6 +24,6 @@ refresh_token = args.refresh_token org_id = args.org_id sddc_id = args.sddc_id -client = create_vmc_draas_client(refresh_token) -site_recovery_activation_task = client.SiteRecovery.get(org_id, sddc_id) +client = create_vmc_client(refresh_token) +site_recovery_activation_task = client.draas.SiteRecovery.get(org_id, sddc_id) print(site_recovery_activation_task)