Fix merge conflicts.

tests/test_ec2/test_tags.py

@@ -2,13 +2,29 @@ from __future__ import unicode_literals
 import itertools
 
 import boto
+from boto.exception import EC2ResponseError
 import sure  # noqa
 
 from moto import mock_ec2
+from nose.tools import assert_raises
 
 
 @mock_ec2
-def test_instance_launch_and_terminate():
+def test_add_tag():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+
+    instance.add_tag("a key", "some value")
+    chain = itertools.chain.from_iterable
+    existing_instances = list(chain([res.instances for res in conn.get_all_instances()]))
+    existing_instances.should.have.length_of(1)
+    existing_instance = existing_instances[0]
+    existing_instance.tags["a key"].should.equal("some value")
+
+
+@mock_ec2
+def test_remove_tag():
     conn = boto.connect_ec2('the_key', 'the_secret')
     reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
@@ -23,16 +39,217 @@ def test_instance_launch_and_terminate():
     instance.remove_tag("a key")
     conn.get_all_tags().should.have.length_of(0)
 
+    instance.add_tag("a key", "some value")
+    conn.get_all_tags().should.have.length_of(1)
+    instance.remove_tag("a key", "some value")
 
 @mock_ec2
-def test_instance_launch_and_retrieve_all_instances():
+def test_get_all_tags():
     conn = boto.connect_ec2('the_key', 'the_secret')
     reservation = conn.run_instances('ami-1234abcd')
     instance = reservation.instances[0]
 
     instance.add_tag("a key", "some value")
-    chain = itertools.chain.from_iterable
-    existing_instances = list(chain([res.instances for res in conn.get_all_instances()]))
-    existing_instances.should.have.length_of(1)
-    existing_instance = existing_instances[0]
-    existing_instance.tags["a key"].should.equal("some value")
+
+    tags = conn.get_all_tags()
+    tag = tags[0]
+    tag.name.should.equal("a key")
+    tag.value.should.equal("some value")
+
+
+@mock_ec2
+def test_create_tags():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    tag_dict = {'a key': 'some value',
+                'another key': 'some other value',
+                'blank key': ''}
+
+    conn.create_tags(instance.id, tag_dict)
+    tags = conn.get_all_tags()
+    set([key for key in tag_dict]).should.equal(set([tag.name for tag in tags]))
+    set([tag_dict[key] for key in tag_dict]).should.equal(set([tag.value for tag in tags]))
+
+
+@mock_ec2
+def test_tag_limit_exceeded():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    tag_dict = {'01': '',
+                '02': '',
+                '03': '',
+                '04': '',
+                '05': '',
+                '06': '',
+                '07': '',
+                '08': '',
+                '09': '',
+                '10': '',
+                '11': ''}
+
+    with assert_raises(EC2ResponseError) as cm:
+        conn.create_tags(instance.id, tag_dict)
+    cm.exception.code.should.equal('TagLimitExceeded')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
+
+    instance.add_tag("a key", "a value")
+    with assert_raises(EC2ResponseError) as cm:
+        conn.create_tags(instance.id, tag_dict)
+    cm.exception.code.should.equal('TagLimitExceeded')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
+
+    tags = conn.get_all_tags()
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.name.should.equal("a key")
+    tag.value.should.equal("a value")
+
+
+@mock_ec2
+def test_invalid_parameter_tag_null():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+
+    with assert_raises(EC2ResponseError) as cm:
+        instance.add_tag("a key", None)
+    cm.exception.code.should.equal('InvalidParameterValue')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
+
+
+@mock_ec2
+def test_invalid_id():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    with assert_raises(EC2ResponseError) as cm:
+        conn.create_tags('ami-blah', {'key': 'tag'})
+    cm.exception.code.should.equal('InvalidID')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
+
+    with assert_raises(EC2ResponseError) as cm:
+        conn.create_tags('blah-blah', {'key': 'tag'})
+    cm.exception.code.should.equal('InvalidID')
+    cm.exception.status.should.equal(400)
+    cm.exception.request_id.should_not.be.none
+
+
+@mock_ec2
+def test_get_all_tags_resource_id_filter():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    instance.add_tag("an instance key", "some value")
+    image_id = conn.create_image(instance.id, "test-ami", "this is a test ami")
+    image = conn.get_image(image_id)
+    image.add_tag("an image key", "some value")
+
+    tags = conn.get_all_tags(filters={'resource-id': instance.id})
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.res_id.should.equal(instance.id)
+    tag.res_type.should.equal('instance')
+    tag.name.should.equal("an instance key")
+    tag.value.should.equal("some value")
+
+    tags = conn.get_all_tags(filters={'resource-id': image_id})
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.res_id.should.equal(image_id)
+    tag.res_type.should.equal('image')
+    tag.name.should.equal("an image key")
+    tag.value.should.equal("some value")
+
+
+@mock_ec2
+def test_get_all_tags_resource_type_filter():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    instance.add_tag("an instance key", "some value")
+    image_id = conn.create_image(instance.id, "test-ami", "this is a test ami")
+    image = conn.get_image(image_id)
+    image.add_tag("an image key", "some value")
+
+    tags = conn.get_all_tags(filters={'resource-type': 'instance'})
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.res_id.should.equal(instance.id)
+    tag.res_type.should.equal('instance')
+    tag.name.should.equal("an instance key")
+    tag.value.should.equal("some value")
+
+    tags = conn.get_all_tags(filters={'resource-type': 'image'})
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.res_id.should.equal(image_id)
+    tag.res_type.should.equal('image')
+    tag.name.should.equal("an image key")
+    tag.value.should.equal("some value")
+
+
+@mock_ec2
+def test_get_all_tags_key_filter():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    instance.add_tag("an instance key", "some value")
+    image_id = conn.create_image(instance.id, "test-ami", "this is a test ami")
+    image = conn.get_image(image_id)
+    image.add_tag("an image key", "some value")
+
+    tags = conn.get_all_tags(filters={'key': 'an instance key'})
+    tag = tags[0]
+    tags.should.have.length_of(1)
+    tag.res_id.should.equal(instance.id)
+    tag.res_type.should.equal('instance')
+    tag.name.should.equal("an instance key")
+    tag.value.should.equal("some value")
+
+
+@mock_ec2
+def test_get_all_tags_value_filter():
+    conn = boto.connect_ec2('the_key', 'the_secret')
+    reservation = conn.run_instances('ami-1234abcd')
+    instance = reservation.instances[0]
+    instance.add_tag("an instance key", "some value")
+    reservation_b = conn.run_instances('ami-1234abcd')
+    instance_b = reservation_b.instances[0]
+    instance_b.add_tag("an instance key", "some other value")
+    reservation_c = conn.run_instances('ami-1234abcd')
+    instance_c = reservation_c.instances[0]
+    instance_c.add_tag("an instance key", "other value*")
+    reservation_d = conn.run_instances('ami-1234abcd')
+    instance_d = reservation_d.instances[0]
+    instance_d.add_tag("an instance key", "other value**")
+    reservation_e = conn.run_instances('ami-1234abcd')
+    instance_e = reservation_e.instances[0]
+    instance_e.add_tag("an instance key", "other value*?")
+    image_id = conn.create_image(instance.id, "test-ami", "this is a test ami")
+    image = conn.get_image(image_id)
+    image.add_tag("an image key", "some value")
+
+    tags = conn.get_all_tags(filters={'value': 'some value'})
+    tags.should.have.length_of(2)
+
+    tags = conn.get_all_tags(filters={'value': 'some*value'})
+    tags.should.have.length_of(3)
+
+    tags = conn.get_all_tags(filters={'value': '*some*value'})
+    tags.should.have.length_of(3)
+
+    tags = conn.get_all_tags(filters={'value': '*some*value*'})
+    tags.should.have.length_of(3)
+
+    tags = conn.get_all_tags(filters={'value': '*value\*'})
+    tags.should.have.length_of(1)
+
+    tags = conn.get_all_tags(filters={'value': '*value\*\*'})
+    tags.should.have.length_of(1)
+
+    tags = conn.get_all_tags(filters={'value': '*value\*\?'})
+    tags.should.have.length_of(1)