Repository: libcloud Updated Branches: refs/heads/trunk 3da15748f -> 18d4c42e9
Shortened filename for test fixture in backup, otherwise pip has issues on windows Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/18d4c42e Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/18d4c42e Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/18d4c42e Branch: refs/heads/trunk Commit: 18d4c42e9bff1f43e248ef259ed2064f72417f68 Parents: 3da1574 Author: anthony-shaw <[email protected]> Authored: Mon Mar 14 09:30:02 2016 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Mar 14 09:30:02 2016 +1100 ---------------------------------------------------------------------- .../backup/fixtures/dimensiondata/_remove_backup_client.xml | 7 +++++++ .../fixtures/dimensiondata/_remove_backup_client_BUSY.xml | 7 +++++++ ...1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml | 7 ------- ..._c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml | 7 ------- libcloud/test/backup/test_dimensiondata.py | 6 ++---- 5 files changed, 16 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/18d4c42e/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client.xml b/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client.xml new file mode 100644 index 0000000..4ce51c6 --- /dev/null +++ b/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<ns6:Status xmlns:ns16="http://oec.api.opsource.net/schemas/storage"; xmlns="http://oec.api.opsource.net/schemas/admin"; xmlns:ns14="http://oec.api.opsource.net/schemas/directory"; xmlns:ns15="http://oec.api.opsource.net/schemas/multigeo"; xmlns:ns9="http://oec.api.opsource.net/schemas/backup"; xmlns:ns5="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns12="http://oec.api.opsource.net/schemas/support"; xmlns:ns13="http://oec.api.opsource.net/schemas/manualimport"; xmlns:ns6="http://oec.api.opsource.net/schemas/general"; xmlns:ns7="http://oec.api.opsource.net/schemas/reset"; xmlns:ns10="http://oec.api.opsource.net/schemas/server"; xmlns:ns8="http://oec.api.opsource.net/schemas/network"; xmlns:ns11="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; xmlns:ns4="http://oec.api.opsource.net/schemas/serverbootstrap"; xmlns:ns3="http://oec.api.opsource.net/schemas/vip";> + <ns6:operation>Disable Backup Client</ns6:operation> + <ns6:result>SUCCESS</ns6:result> + <ns6:resultDetail>Backup Client disabled</ns6:resultDetail> + <ns6:resultCode>REASON_0</ns6:resultCode> +</ns6:Status> http://git-wip-us.apache.org/repos/asf/libcloud/blob/18d4c42e/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client_BUSY.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client_BUSY.xml b/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client_BUSY.xml new file mode 100644 index 0000000..6c2db63 --- /dev/null +++ b/libcloud/test/backup/fixtures/dimensiondata/_remove_backup_client_BUSY.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<ns6:Status xmlns:ns16="http://oec.api.opsource.net/schemas/storage"; xmlns="http://oec.api.opsource.net/schemas/admin"; xmlns:ns14="http://oec.api.opsource.net/schemas/directory"; xmlns:ns15="http://oec.api.opsource.net/schemas/multigeo"; xmlns:ns9="http://oec.api.opsource.net/schemas/backup"; xmlns:ns5="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns12="http://oec.api.opsource.net/schemas/support"; xmlns:ns13="http://oec.api.opsource.net/schemas/manualimport"; xmlns:ns6="http://oec.api.opsource.net/schemas/general"; xmlns:ns7="http://oec.api.opsource.net/schemas/reset"; xmlns:ns10="http://oec.api.opsource.net/schemas/server"; xmlns:ns8="http://oec.api.opsource.net/schemas/network"; xmlns:ns11="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; xmlns:ns4="http://oec.api.opsource.net/schemas/serverbootstrap"; xmlns:ns3="http://oec.api.opsource.net/schemas/vip";> + <ns6:operation>Disable Backup Client</ns6:operation> + <ns6:result>ERROR</ns6:result> + <ns6:resultDetail>DISABLE_BACKUP_CLIENT 'didata-backup-test6[172-16-1-14]' - failed - Unexpected error occurred with NA9 Backup system at 2016-02-12 00:03:50.952, TransactionId: (9d483a7a-1cc9-441b-920c-e11fb0e94ba6), PCSOperation: DeprovisionBackupClient, Backup Client is currently performing another operation: Backup client is currently busy</ns6:resultDetail> + <ns6:resultCode>REASON_547</ns6:resultCode> +</ns6:Status> http://git-wip-us.apache.org/repos/asf/libcloud/blob/18d4c42e/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml b/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml deleted file mode 100644 index 4ce51c6..0000000 --- a/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<ns6:Status xmlns:ns16="http://oec.api.opsource.net/schemas/storage"; xmlns="http://oec.api.opsource.net/schemas/admin"; xmlns:ns14="http://oec.api.opsource.net/schemas/directory"; xmlns:ns15="http://oec.api.opsource.net/schemas/multigeo"; xmlns:ns9="http://oec.api.opsource.net/schemas/backup"; xmlns:ns5="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns12="http://oec.api.opsource.net/schemas/support"; xmlns:ns13="http://oec.api.opsource.net/schemas/manualimport"; xmlns:ns6="http://oec.api.opsource.net/schemas/general"; xmlns:ns7="http://oec.api.opsource.net/schemas/reset"; xmlns:ns10="http://oec.api.opsource.net/schemas/server"; xmlns:ns8="http://oec.api.opsource.net/schemas/network"; xmlns:ns11="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; xmlns:ns4="http://oec.api.opsource.net/schemas/serverbootstrap"; xmlns:ns3="http://oec.api.opsource.net/schemas/vip";> - <ns6:operation>Disable Backup Client</ns6:operation> - <ns6:result>SUCCESS</ns6:result> - <ns6:resultDetail>Backup Client disabled</ns6:resultDetail> - <ns6:resultCode>REASON_0</ns6:resultCode> -</ns6:Status> http://git-wip-us.apache.org/repos/asf/libcloud/blob/18d4c42e/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml ---------------------------------------------------------------------- diff --git a/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml b/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml deleted file mode 100644 index 6c2db63..0000000 --- a/libcloud/test/backup/fixtures/dimensiondata/oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<ns6:Status xmlns:ns16="http://oec.api.opsource.net/schemas/storage"; xmlns="http://oec.api.opsource.net/schemas/admin"; xmlns:ns14="http://oec.api.opsource.net/schemas/directory"; xmlns:ns15="http://oec.api.opsource.net/schemas/multigeo"; xmlns:ns9="http://oec.api.opsource.net/schemas/backup"; xmlns:ns5="http://oec.api.opsource.net/schemas/datacenter"; xmlns:ns12="http://oec.api.opsource.net/schemas/support"; xmlns:ns13="http://oec.api.opsource.net/schemas/manualimport"; xmlns:ns6="http://oec.api.opsource.net/schemas/general"; xmlns:ns7="http://oec.api.opsource.net/schemas/reset"; xmlns:ns10="http://oec.api.opsource.net/schemas/server"; xmlns:ns8="http://oec.api.opsource.net/schemas/network"; xmlns:ns11="http://oec.api.opsource.net/schemas/whitelabel"; xmlns:ns2="http://oec.api.opsource.net/schemas/organization"; xmlns:ns4="http://oec.api.opsource.net/schemas/serverbootstrap"; xmlns:ns3="http://oec.api.opsource.net/schemas/vip";> - <ns6:operation>Disable Backup Client</ns6:operation> - <ns6:result>ERROR</ns6:result> - <ns6:resultDetail>DISABLE_BACKUP_CLIENT 'didata-backup-test6[172-16-1-14]' - failed - Unexpected error occurred with NA9 Backup system at 2016-02-12 00:03:50.952, TransactionId: (9d483a7a-1cc9-441b-920c-e11fb0e94ba6), PCSOperation: DeprovisionBackupClient, Backup Client is currently performing another operation: Backup client is currently busy</ns6:resultDetail> - <ns6:resultCode>REASON_547</ns6:resultCode> -</ns6:Status> http://git-wip-us.apache.org/repos/asf/libcloud/blob/18d4c42e/libcloud/test/backup/test_dimensiondata.py ---------------------------------------------------------------------- diff --git a/libcloud/test/backup/test_dimensiondata.py b/libcloud/test/backup/test_dimensiondata.py index b376f24..d7a587b 100644 --- a/libcloud/test/backup/test_dimensiondata.py +++ b/libcloud/test/backup/test_dimensiondata.py @@ -350,16 +350,14 @@ class DimensionDataMockHttp(MockHttp): def _oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8( self, method, url, body, headers): body = self.fixtures.load( - ('oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87' - '_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client.xml') + ('_remove_backup_client.xml') ) return (httplib.OK, body, {}, httplib.responses[httplib.OK]) def _oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_BUSY( self, method, url, body, headers): body = self.fixtures.load( - ('oec_0_9_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_e75ead52_692f_4314_8725_c8a4f4d13a87' - '_backup_client_30b1ff76_c76d_4d7c_b39d_3b72be0384c8_remove_backup_client_BUSY.xml') + ('_remove_backup_client_BUSY.xml') ) return (httplib.BAD_REQUEST, body, {}, httplib.responses[httplib.OK])
