Merge remote-tracking branch 'upstream/master' into update_create_device

Author: jasmingacic

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [1.39.0] - 2019-08-26
+### Added
+- Support for Organizations, Events, Emails, VLAN, Snapshot Policies, Batches, Ports, VPN and IPs.
+- Live tests
+
 ## [1.38.2] - 2019-05-30
 ### Added
 - Test fixtures to sdist

packet/BGPConfig.py

@@ -4,19 +4,19 @@
 
 class BGPConfig:
     def __init__(self, data):
-        self.id = data["id"]
-        self.status = data["status"]
-        self.deployment_type = data["deployment_type"]
-        self.asn = data["asn"]
-        self.md5 = data["md5"]
-        self.route_object = data["route_object"]
-        self.max_prefix = data["max_prefix"]
-        self.created_at = data["created_at"]
-        self.requested_at = data["requested_at"]
-        self.project = data["project"]
-        self.sessions = data["sessions"]
-        self.ranges = data["ranges"]
-        self.href = data["href"]
+        self.id = data.get("id")
+        self.status = data.get("status")
+        self.deployment_type = data.get("deployment_type")
+        self.asn = data.get("asn")
+        self.md5 = data.get("md5")
+        self.route_object = data.get("route_object")
+        self.max_prefix = data.get("max_prefix")
+        self.created_at = data.get("created_at")
+        self.requested_at = data.get("requested_at")
+        self.project = data.get("project")
+        self.sessions = data.get("sessions")
+        self.ranges = data.get("ranges")
+        self.href = data.get("href")
 
     def __str__(self):
         return "%s" % self.id

packet/BGPSession.py

@@ -4,16 +4,16 @@
 
 class BGPSession:
     def __init__(self, data):
-        self.id = data["id"]
-        self.status = data["status"]
-        self.learned_routes = data["learned_routes"]
-        self.switch_name = data["switch_name"]
-        self.default_route = data["default_route"]
-        self.created_at = data["created_at"]
-        self.updated_at = data["updated_at"]
-        self.device = data["device"]
-        self.address_family = data["address_family"]
-        self.href = data["href"]
+        self.id = data.get("id")
+        self.status = data.get("status")
+        self.learned_routes = data.get("learned_routes")
+        self.switch_name = data.get("switch_name")
+        self.default_route = data.get("default_route")
+        self.created_at = data.get("created_at")
+        self.updated_at = data.get("updated_at")
+        self.device = data.get("device")
+        self.address_family = data.get("address_family")
+        self.href = data.get("href")
 
     def __str__(self):
         return "%s" % self.id

packet/Batch.py

@@ -4,26 +4,16 @@
 
 class Batch:
     def __init__(self, data):
-        if data["id"] is not None:
-            self.id = data["id"]
-        if data["error_messages"] is not None:
-            self.error_messages = data["error_messages"]
-        if data["quantity"] is not None:
-            self.quantity = data["quantity"]
-        if data["state"] is not None:
-            self.state = data["state"]
-        if data["created_at"] is not None:
-            self.created_at = data["created_at"]
-        if data["updated_at"] is not None:
-            self.updated_at = data["updated_at"]
-        if data["devices"] is not None:
-            self.devices = data["devices"]
-        if data["project"] is not None:
-            self.project = data["project"]
-        if data["state"] is not None:
-            self.state = data["state"]
-        if data["error_messages"] is not None:
-            self.error_messages = data["error_messages"]
+        self.id = data.get("id")
+        self.error_messages = data.get("error_messages")
+        self.quantity = data.get("quantity")
+        self.state = data.get("state")
+        self.created_at = data.get("created_at")
+        self.updated_at = data.get("updated_at")
+        self.devices = data.get("devices")
+        self.project = data.get("project")
+        self.state = data.get("state")
+        self.error_messages = data.get("error_messages")
 
     def __str__(self):
         return "%s" % self.id

packet/Device.py

@@ -7,48 +7,38 @@ class Device:
     def __init__(self, data, manager):
         self.manager = manager
 
-        self.id = data["id"]
-        self.short_id = data["short_id"]
-        self.hostname = data["hostname"]
-        self.description = data["description"]
-        self.state = data["state"]
-        self.tags = data["tags"]
-        if "image_url" in data:
-            self.image_url = data["image_url"]
-        self.billing_cycle = data["billing_cycle"]
-        self.user = data["user"]
-        self.iqn = data["iqn"]
-        self.locked = data["locked"]
-        self.bonding_mode = data["bonding_mode"]
-        self.created_at = data["created_at"]
-        self.updated_at = data["updated_at"]
+        self.id = data.get("id")
+        self.short_id = data.get("short_id")
+        self.hostname = data.get("hostname")
+        self.description = data.get("description")
+        self.state = data.get("state")
+        self.tags = data.get("tags")
+        self.image_url = data.get("image_url")
+        self.billing_cycle = data.get("billing_cycle")
+        self.user = data.get("user")
+        self.iqn = data.get("iqn")
+        self.locked = data.get("locked")
+        self.bonding_mode = data.get("bonding_mode")
+        self.created_at = data.get("created_at")
+        self.updated_at = data.get("updated_at")
         self.ipxe_script_url = data.get("ipxe_script_url", None)
         self.always_pxe = data.get("always_pxe", False)
-        if "storage" in data:
-            self.storage = data["storage"]
+        self.storage = data.get("storage")
         self.customdata = data.get("customdata", None)
-        self.operating_system = data["operating_system"]
-        self.facility = data["facility"]
-        self.project = data["project"]
-        if "ssh_keys" in data:
-            self.ssh_keys = data["ssh_keys"]
-        if "project_lite" in data:
-            self.project_lite = data["project_lite"]
-
-        if "volumes" in data:
-            self.volumes = data["volumes"]
-
-        self.ip_addresses = data["ip_addresses"]
-        self.plan = data["plan"]
-        self.userdata = data["userdata"]
-        if "switch_uuid" in data:
-            self.switch_uuid = data["switch_uuid"]
-        if "network_ports" in data:
-            self.network_ports = data["network_ports"]
-        self.href = data["href"]
+        self.operating_system = data.get("operating_system")
+        self.facility = data.get("facility")
+        self.project = data.get("project")
+        self.ssh_keys = data.get("ssh_keys")
+        self.project_lite = data.get("project_lite")
+        self.volumes = data.get("volumes")
+        self.ip_addresses = data.get("ip_addresses")
+        self.plan = data.get("plan")
+        self.userdata = data.get("userdata")
+        self.switch_uuid = data.get("switch_uuid")
+        self.network_ports = data.get("network_ports")
+        self.href = data.get("href")
         self.spot_instance = data.get("spot_instance", False)
-        if "root_password" in data:
-            self.root_password = data["root_password"]
+        self.root_password = data.get("root_password")
 
     def update(self):
         params = {

packet/DeviceBatch.py

@@ -4,16 +4,11 @@
 
 class DeviceBatch:
     def __init__(self, data):
-        if "hostname" in data:
-            self.hostname = data["hostname"]
-        if "plan" in data:
-            self.plan = data["plan"]
-        if "operating_system" in data:
-            self.operating_system = data["operating_system"]
-        if "facility" in data:
-            self.facility = data["facility"]
-        if "quantity" in data:
-            self.quantity = data["quantity"]
+        self.hostname = data.get("hostname")
+        self.plan = data.get("plan")
+        self.operating_system = data.get("operating_system")
+        self.facility = data.get("facility")
+        self.quantity = data.get("quantity")
 
     def __str__(self):
         return "%s" % self.hostname

packet/Email.py

@@ -6,10 +6,10 @@ class Email:
     def __init__(self, data, manager):
         self.manager = manager
 
-        self.id = data["id"]
-        self.address = data["address"]
-        self.default = data["default"]
-        self.verified = data["verified"]
+        self.id = data.get("id")
+        self.address = data.get("address")
+        self.default = data.get("default")
+        self.verified = data.get("verified")
 
     def update(self):
         params = {"address": self.address, "default": self.default}

packet/Event.py

@@ -4,14 +4,14 @@
 
 class Event:
     def __init__(self, data):
-        self.id = data["id"]
-        self.type = data["type"]
-        self.body = data["body"]
-        self.state = data["state"]
-        self.created_at = data["created_at"]
-        self.modified_by = data["modified_by"]
-        self.ip = data["ip"]
-        self.interpolated = data["interpolated"]
+        self.id = data.get("id")
+        self.type = data.get("type")
+        self.body = data.get("body")
+        self.state = data.get("state")
+        self.created_at = data.get("created_at")
+        self.modified_by = data.get("modified_by")
+        self.ip = data.get("ip")
+        self.interpolated = data.get("interpolated")
 
     def __str__(self):
         return "%s" % self.interpolated

packet/Facility.py

@@ -4,16 +4,11 @@
 
 class Facility:
     def __init__(self, data):
-        if "id" in data:
-            self.id = data["id"]
-        if "code" in data:
-            self.code = data["code"]
-        if "name" in data:
-            self.name = data["name"]
-        if "features" in data:
-            self.features = data["features"]
-        if "address" in data:
-            self.address = data["address"]
+        self.id = data.get("id")
+        self.code = data.get("code")
+        self.name = data.get("name")
+        self.features = data.get("features")
+        self.address = data.get("address")
 
     def __str__(self):
         return "%s" % self.code

packet/IPAddress.py

@@ -8,34 +8,27 @@ class IPAddress:
     def __init__(self, data, manager):
         self.manager = manager
 
-        self.id = data["id"]
-        self.address_family = data["address_family"]
-        self.netmask = data["netmask"]
-        self.created_at = data["created_at"]
-        self.details = data["details"]
-        self.tags = data["tags"]
-        self.public = data["public"]
-        self.cidr = data["cidr"]
-        self.management = data["management"]
-        self.enabled = data["enabled"]
-        self.global_ip = data["global_ip"]
-        self.customdata = data["customdata"]
-        self.project = data["project"]
-        self.project_lite = data["project_lite"]
-        self.facility = Facility(data["facility"])
-
-        if "details" in data:
-            self.details = data["details"]
-        if "assigned_to" in data:
-            self.assigned_to = data["assigned_to"]
-        if "interface" in data:
-            self.interface = data["interface"]
-        if "network" in data:
-            self.network = data["network"]
-        if "address" in data:
-            self.address = data["address"]
-        if "gateway" in data:
-            self.gateway = data["gateway"]
+        self.id = data.get("id")
+        self.address_family = data.get("address_family")
+        self.netmask = data.get("netmask")
+        self.created_at = data.get("created_at")
+        self.details = data.get("details")
+        self.tags = data.get("tags")
+        self.public = data.get("public")
+        self.cidr = data.get("cidr")
+        self.management = data.get("management")
+        self.enabled = data.get("enabled")
+        self.global_ip = data.get("global_ip")
+        self.customdata = data.get("customdata")
+        self.project = data.get("project")
+        self.project_lite = data.get("project_lite")
+        self.facility = Facility(data.get("facility"))
+        self.details = data.get("details")
+        self.assigned_to = data.get("assigned_to")
+        self.interface = data.get("interface")
+        self.network = data.get("network")
+        self.address = data.get("address")
+        self.gateway = data.get("gateway")
 
     def delete(self):
         return self.manager.call_api("ips/%s" % self.id, type="DELETE")