Merge pull request #179 from caseyhen/master

Fix for #178
koalalorenzo · Feb 11, 2017 · ecf2c1b · ecf2c1b
2 parents 11bdef7 + e845a99
commit ecf2c1b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/digitalocean/Droplet.py b/digitalocean/Droplet.py
@@ -122,6 +122,7 @@ def create_multiple(*args, **kwargs):
             "backups": bool(kwargs.get("backups")),
             "ipv6": bool(kwargs.get("ipv6")),
             "private_networking": bool(kwargs.get("private_networking")),
+            "tags": kwargs.get("tags"),
             "monitoring": bool(kwargs.get("monitoring")),
         }
 
@@ -553,6 +554,7 @@ def create(self, *args, **kwargs):
             "ipv6": bool(self.ipv6),
             "private_networking": bool(self.private_networking),
             "volumes": self.volumes,
+            "tags": self.tags,
             "monitoring": bool(self.monitoring),
         }
 

diff --git a/digitalocean/tests/data/droplet_actions/create.json b/digitalocean/tests/data/droplet_actions/create.json
@@ -30,7 +30,10 @@
     "networks": {
     },
     "region": {
-    }
+    },
+    "tags": [
+      "web"
+    ]
   },
   "links": {
     "actions": [

diff --git a/digitalocean/tests/data/droplet_actions/create_multiple.json b/digitalocean/tests/data/droplet_actions/create_multiple.json
@@ -30,7 +30,10 @@
     "networks": {
     },
     "region": {
-    }
+    },
+    "tags": [
+      "web"
+    ]
   }, {
     "id": 3164495,
     "name": "example2.com",
@@ -62,7 +65,10 @@
     "networks": {
     },
     "region": {
-    }
+    },
+    "tags": [
+      "web"
+    ]
   }],
   "links": {
     "actions": [

diff --git a/digitalocean/tests/test_droplet.py b/digitalocean/tests/test_droplet.py
@@ -799,7 +799,8 @@ def test_create_no_keys(self):
                                        private_networking=True,
                                        monitoring=True,
                                        user_data="Some user data.",
-                                       token=self.token)
+                                       token=self.token,
+                                       tags=["web"])
         droplet.create()
 
         self.assert_url_query_equal(responses.calls[0].request.url,
@@ -812,7 +813,7 @@ def test_create_no_keys(self):
              u"private_networking": True, u"monitoring": True,
              u"backups": True, u"image": u"ubuntu-14-04-x64",
              u"size": u"512mb", u"ssh_keys": [],
-             u"volumes": []})
+             u"volumes": [], u"tags": ["web"]})
         self.assertEqual(droplet.id, 3164494)
         self.assertEqual(droplet.action_ids, [36805096])
 
@@ -836,7 +837,8 @@ def test_create_multiple_no_keys(self):
                                                         private_networking=True,
                                                         monitoring=True,
                                                         user_data="Some user data.",
-                                                        token=self.token)
+                                                        token=self.token,
+                                                        tags=["web"])
         self.assert_url_query_equal(responses.calls[0].request.url,
                                     self.base_url + "droplets")
         self.assertEqual(len(droplets), 2)
@@ -852,7 +854,7 @@ def test_create_multiple_no_keys(self):
              u"user_data": u"Some user data.", u"ipv6": True,
              u"private_networking": True,  u"monitoring": True,
              u"backups": True, u"image": u"ubuntu-14-04-x64",
-             u"size": u"512mb"})
+             u"size": u"512mb", u"tags": ["web"]})
 
 
     @responses.activate