Skip to content

Commit

Permalink
Add Layer2.delete_vault
Browse files Browse the repository at this point in the history
This allow layer2 to be used to both create and
delete vaults.  I've also added the start of integration tests for
layer2 that will create, retrieve, and delete a vault.
  • Loading branch information
jamesls committed Sep 6, 2012
1 parent c8da962 commit f85bc3c
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 0 deletions.
19 changes: 19 additions & 0 deletions boto/glacier/layer2.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,25 @@ def create_vault(self, name):
self.layer1.create_vault(name)
return self.get_vault(name)

def delete_vault(self, name):
"""Delete a vault.
This operation deletes a vault. Amazon Glacier will delete a
vault only if there are no archives in the vault as per the
last inventory and there have been no writes to the vault
since the last inventory. If either of these conditions is not
satisfied, the vault deletion fails (that is, the vault is not
removed) and Amazon Glacier returns an error.
This operation is idempotent, you can send the same request
multiple times and it has no further effect after the first
time Amazon Glacier delete the specified vault.
:type vault_name: str
:param vault_name: The name of the vault to delete.
"""
return self.layer1.delete_vault(name)

def get_vault(self, name):
"""
Get an object representing a named vault from Glacier. This
Expand Down
Empty file.
45 changes: 45 additions & 0 deletions tests/integration/glacier/test_layer2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# Copyright (c) 2012 Amazon.com, Inc. or its affiliates. All Rights Reserved
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish, dis-
# tribute, sublicense, and/or sell copies of the Software, and to permit
# persons to whom the Software is furnished to do so, subject to the fol-
# lowing conditions:
#
# The above copyright notice and this permission notice shall be included
# in all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
# ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
# SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
# IN THE SOFTWARE.
#
import time
from tests.unit import unittest

from boto.glacier.layer2 import Layer1, Layer2


class TestGlacierLayer2(unittest.TestCase):
glacier = True

def setUp(self):
self.layer2 = Layer2()
self.vault_name = 'testvault%s' % int(time.time())

def test_create_delete_vault(self):
vault = self.layer2.create_vault(self.vault_name)
retrieved_vault = self.layer2.get_vault(self.vault_name)
self.layer2.delete_vault(self.vault_name)
self.assertEqual(vault.name, retrieved_vault.name)
self.assertEqual(vault.arn, retrieved_vault.arn)
self.assertEqual(vault.creation_date, retrieved_vault.creation_date)
self.assertEqual(vault.last_inventory_date,
retrieved_vault.last_inventory_date)
self.assertEqual(vault.number_of_archives,
retrieved_vault.number_of_archives)

0 comments on commit f85bc3c

Please sign in to comment.