diff --git a/libcloud/common/dimensiondata.py b/libcloud/common/dimensiondata.py
index 5a023b343f..d6792d99d7 100644
--- a/libcloud/common/dimensiondata.py
+++ b/libcloud/common/dimensiondata.py
@@ -80,6 +80,11 @@
 DEFAULT_REGION = 'dd-na'
 
 
+class NetworkDomainServicePlan(object):
+    ESSENTIALS = "ESSENTIALS"
+    ADVANCED = "ADVANCED"
+
+
 class DimensionDataResponse(XmlResponse):
     def parse_error(self):
         if self.status == httplib.UNAUTHORIZED:
@@ -282,12 +287,13 @@ class DimensionDataNetworkDomain(object):
     DimensionData network domain with location.
     """
 
-    def __init__(self, id, name, description, location, status):
+    def __init__(self, id, name, description, location, status, plan):
         self.id = str(id)
         self.name = name
         self.description = description
         self.location = location
         self.status = status
+        self.plan = plan
 
     def __repr__(self):
         return (('<DimensionDataNetworkDomain: id=%s, name=%s,'
@@ -296,20 +302,126 @@ def __repr__(self):
                    self.status))
 
 
+class DimensionDataPublicIpBlock(object):
+    """
+    DimensionData Public IP Block with location.
+    """
+
+    def __init__(self, id, base_ip, size, location, network_domain,
+                 status):
+        self.id = str(id)
+        self.base_ip = base_ip
+        self.size = size
+        self.location = location
+        self.network_domain = network_domain
+        self.status = status
+
+    def __repr__(self):
+        return (('<DimensionDataNetworkDomain: id=%s, base_ip=%s,'
+                 'size=%s, location=%s, status=%s>')
+                % (self.id, self.base_ip, self.size, self.location,
+                   self.status))
+
+
+class DimensionDataFirewallRule(object):
+    """
+    DimensionData Firewall Rule for a network domain
+    """
+
+    def __init__(self, id, name, action, location, network_domain,
+                 status, ip_version, protocol, source, destination,
+                 enabled):
+        self.id = str(id)
+        self.name = name
+        self.action = action
+        self.location = location
+        self.network_domain = network_domain
+        self.status = status
+        self.ip_version = ip_version
+        self.protocol = protocol
+        self.source = source
+        self.destination = destination
+        self.enabled = enabled
+
+    def __repr__(self):
+        return (('<DimensionDataNetworkDomain: id=%s, name=%s,'
+                 'action=%s, location=%s, status=%s>')
+                % (self.id, self.name, self.action, self.location,
+                   self.status))
+
+
+class DimensionDataFirewallAddress(object):
+    """
+    The source or destination model in a firewall rule
+    """
+    def __init__(self, any_ip, ip_address, ip_prefix_size,
+                 port_begin, port_end):
+        self.any_ip = any_ip
+        self.ip_address = ip_address
+        self.ip_prefix_size = ip_prefix_size
+        self.port_begin = port_begin
+        self.port_end = port_end
+
+
+class DimensionDataNatRule(object):
+    """
+    An IP NAT rule in a network domain
+    """
+    def __init__(self, id, network_domain, internal_ip, external_ip, status):
+        self.id = id
+        self.network_domain = network_domain
+        self.internal_ip = internal_ip
+        self.external_ip = external_ip
+        self.status = status
+
+    def __repr__(self):
+        return (('<DimensionDataNatRule: id=%s, status=%s>')
+                % (self.id, self.status))
+
+
 class DimensionDataVlan(object):
     """
     DimensionData VLAN.
     """
 
-    def __init__(self, id, name, description, location, status):
+    def __init__(self, id, name, description, location, status,
+                 private_ipv4_range_address, private_ipv4_range_size):
+        """
+        Initialize an instance of ``DimensionDataVlan``
+
+        :param id: The ID of the VLAN
+        :type  id: ``string``
+
+        :param name: The name of the VLAN
+        :type  name: ``string``
+
+        :param description: Plan text description of the VLAN
+        :type  description: ``string``
+
+        :param location: The location (data center) of the VLAN
+        :type  location: ``NodeLocation``
+
+        :param status: The status of the VLAN
+        :type  status: ``DimensionDataStatus``
+
+        :param private_ipv4_range_address: The host address of the VLAN
+                                            IP space
+        :type  private_ipv4_range_address: ``string``
+
+        :param private_ipv4_range_address: The size (e.g. '24') of the VLAN
+                                            as a CIDR range size
+        :type  private_ipv4_range_address: ``string``
+        """
         self.id = str(id)
         self.name = name
         self.location = location
         self.description = description
         self.status = status
+        self.private_ipv4_range_address = private_ipv4_range_address
+        self.private_ipv4_range_size = private_ipv4_range_size
 
     def __repr__(self):
-        return (('<DimensionDataNetworkDomain: id=%s, name=%s, '
+        return (('<DimensionDataVlan: id=%s, name=%s, '
                  'description=%s, location=%s, status=%s>')
                 % (self.id, self.name, self.description,
                    self.location, self.status))
@@ -320,11 +432,16 @@ class DimensionDataPool(object):
     DimensionData VIP Pool.
     """
 
-    def __init__(self, id, name, description, status):
+    def __init__(self, id, name, description, status, load_balance_method,
+                 health_monitor_id, service_down_action, slow_ramp_time):
         self.id = str(id)
         self.name = name
         self.description = description
         self.status = status
+        self.load_balance_method = load_balance_method
+        self.health_monitor_id = health_monitor_id
+        self.service_down_action = service_down_action
+        self.slow_ramp_time = slow_ramp_time
 
     def __repr__(self):
         return (('<DimensionDataPool: id=%s, name=%s, '
@@ -355,11 +472,14 @@ def __repr__(self):
 
 
 class DimensionDataVIPNode(object):
-    def __init__(self, id, name, status, ip):
+    def __init__(self, id, name, status, ip, connection_limit='10000',
+                 connection_rate_limit='10000'):
         self.id = str(id)
         self.name = name
         self.status = status
         self.ip = ip
+        self.connection_limit = connection_limit
+        self.connection_rate_limit = connection_rate_limit
 
     def __repr__(self):
         return (('<DimensionDataVIPNode: id=%s, name=%s, '
diff --git a/libcloud/compute/drivers/dimensiondata.py b/libcloud/compute/drivers/dimensiondata.py
index e1ce7a8911..18d745646f 100644
--- a/libcloud/compute/drivers/dimensiondata.py
+++ b/libcloud/compute/drivers/dimensiondata.py
@@ -28,6 +28,11 @@
 from libcloud.common.dimensiondata import DimensionDataNetwork
 from libcloud.common.dimensiondata import DimensionDataNetworkDomain
 from libcloud.common.dimensiondata import DimensionDataVlan
+from libcloud.common.dimensiondata import DimensionDataPublicIpBlock
+from libcloud.common.dimensiondata import DimensionDataFirewallRule
+from libcloud.common.dimensiondata import DimensionDataFirewallAddress
+from libcloud.common.dimensiondata import DimensionDataNatRule
+from libcloud.common.dimensiondata import NetworkDomainServicePlan
 from libcloud.common.dimensiondata import API_ENDPOINTS
 from libcloud.common.dimensiondata import DEFAULT_REGION
 from libcloud.common.dimensiondata import TYPES_URN
@@ -166,8 +171,8 @@ def destroy_node(self, node):
             'server/deleteServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def reboot_node(self, node):
         request_elm = ET.Element('rebootServer',
@@ -176,8 +181,8 @@ def reboot_node(self, node):
             'server/rebootServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def list_nodes(self):
         nodes = self._to_nodes(
@@ -305,8 +310,8 @@ def ex_start_node(self, node):
             'server/startServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_shutdown_graceful(self, node):
         """
@@ -326,8 +331,8 @@ def ex_shutdown_graceful(self, node):
             'server/shutdownServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_power_off(self, node):
         """
@@ -347,8 +352,8 @@ def ex_power_off(self, node):
             'server/powerOffServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_reset(self, node):
         """
@@ -368,8 +373,34 @@ def ex_reset(self, node):
             'server/resetServer',
             method='POST',
             data=ET.tostring(request_elm)).object
-        result = findtext(body, 'responseCode', TYPES_URN)
-        return result == 'IN_PROGRESS'
+        response_code = findtext(body, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
+    def ex_attach_node_to_vlan(self, node, vlan):
+        request = ET.Element('addNic',
+                             {'xmlns': TYPES_URN})
+        ET.SubElement(request, 'serverId').text = node.id
+        nic = ET.SubElement(request, 'nic')
+        ET.SubElement(nic, 'vlanId').text = vlan.id
+
+        response = self.connection.request_with_orgId_api_2(
+            'server/addNic',
+            method='POST',
+            data=ET.tostring(request)).object
+        response_code = findtext(response, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
+    def ex_destroy_nic(self, nic_id):
+        request = ET.Element('removeNic',
+                             {'xmlns': TYPES_URN,
+                              'id': nic_id})
+
+        response = self.connection.request_with_orgId_api_2(
+            'server/removeNic',
+            method='POST',
+            data=ET.tostring(request)).object
+        response_code = findtext(response, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_list_networks(self, location=None):
         """
@@ -388,6 +419,12 @@ def ex_list_networks(self, location=None):
                                       params=params).object
         return self._to_networks(response)
 
+    def ex_get_network_domain(self, network_domain_id):
+        locations = self.list_locations()
+        net = self.connection.request_with_orgId_api_2(
+            'network/networkDomain/%s' % network_domain_id).object
+        return self._to_network_domain(net, locations)
+
     def ex_list_network_domains(self, location=None):
         """
         List networks deployed across all data center locations for your
@@ -405,6 +442,163 @@ def ex_list_network_domains(self, location=None):
                                       params=params).object
         return self._to_network_domains(response)
 
+    def ex_create_network_domain(self, location, name, service_plan,
+                                 description=None):
+        """
+        Deploy a new network domain to a data center
+        """
+        create_node = ET.Element('deployNetworkDomain', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node, "datacenterId").text = location.id
+        ET.SubElement(create_node, "name").text = name
+        if description is not None:
+            ET.SubElement(create_node, "description").text = description
+        ET.SubElement(create_node, "type").text = service_plan
+
+        response = self.connection.request_with_orgId_api_2(
+            'network/deployNetworkDomain',
+            method='POST',
+            data=ET.tostring(create_node)).object
+
+        network_domain_id = None
+
+        for info in findall(response, 'info', TYPES_URN):
+            if info.get('name') == 'networkDomainId':
+                network_domain_id = info.get('value')
+
+        return DimensionDataNetworkDomain(
+            id=network_domain_id,
+            name=name,
+            description=description,
+            location=location,
+            status=NodeState.RUNNING,
+            plan=service_plan
+        )
+
+    def ex_update_network_domain(self, network_domain):
+        """
+        Update the properties of a network domain
+        """
+        edit_node = ET.Element('editNetworkDomain', {'xmlns': TYPES_URN})
+        edit_node.set('id', network_domain.id)
+        ET.SubElement(edit_node, "name").text = network_domain.name
+        if network_domain.description is not None:
+            ET.SubElement(edit_node, "description").text \
+                = network_domain.description
+        ET.SubElement(edit_node, "type").text = network_domain.plan
+
+        self.connection.request_with_orgId_api_2(
+            'network/editNetworkDomain',
+            method='POST',
+            data=ET.tostring(edit_node)).object
+
+        return network_domain
+
+    def ex_delete_network_domain(self, network_domain):
+        delete_node = ET.Element('deleteNetworkDomain', {'xmlns': TYPES_URN})
+        delete_node.set('id', network_domain.id)
+        result = self.connection.request_with_orgId_api_2(
+            'network/deleteNetworkDomain',
+            method='POST',
+            data=ET.tostring(delete_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
+    def ex_create_vlan(self,
+                       network_domain,
+                       name,
+                       private_ipv4_base_address,
+                       description=None,
+                       private_ipv4_prefix_size='24'):
+        """
+        Deploy a new VLAN to a network domain
+        """
+        create_node = ET.Element('deployVlan', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node, "networkDomainId").text = network_domain.id
+        ET.SubElement(create_node, "name").text = name
+        if description is not None:
+            ET.SubElement(create_node, "description").text = description
+        ET.SubElement(create_node, "privateIpv4BaseAddress").text = \
+            private_ipv4_base_address
+        ET.SubElement(create_node, "privateIpv4PrefixSize").text = \
+            private_ipv4_prefix_size
+
+        response = self.connection.request_with_orgId_api_2(
+            'network/deployVlan',
+            method='POST',
+            data=ET.tostring(create_node)).object
+
+        vlan_id = None
+
+        for info in findall(response, 'info', TYPES_URN):
+            if info.get('name') == 'vlanId':
+                vlan_id = info.get('value')
+
+        return DimensionDataVlan(
+            id=vlan_id,
+            name=name,
+            description=description,
+            location=network_domain.location,
+            status=NodeState.RUNNING,
+            private_ipv4_range_address=private_ipv4_base_address,
+            private_ipv4_range_size=private_ipv4_prefix_size
+        )
+
+    def ex_get_vlan(self, vlan_id):
+        locations = self.list_locations()
+        vlan = self.connection.request_with_orgId_api_2(
+            'network/vlan/%s' % vlan_id).object
+        return self._to_vlan(vlan, locations)
+
+    def ex_update_vlan(self, vlan):
+        """
+        Updates the properties of the given VLAN
+        Only name and description are updated
+        """
+        edit_node = ET.Element('editVlan', {'xmlns': TYPES_URN})
+        edit_node.set('id', vlan.id)
+        ET.SubElement(edit_node, "name").text = vlan.name
+        if vlan.description is not None:
+            ET.SubElement(edit_node, "description").text \
+                = vlan.description
+
+        self.connection.request_with_orgId_api_2(
+            'network/editVlan',
+            method='POST',
+            data=ET.tostring(edit_node)).object
+
+        return vlan
+
+    def ex_expand_vlan(self, vlan):
+        """
+        Expands the VLAN to the prefix size in private_ipv4_range_size
+        The expansion will
+        not be permitted if the proposed IP space overlaps with an
+        already deployed VLANs IP space.
+        """
+        edit_node = ET.Element('expandVlan', {'xmlns': TYPES_URN})
+        edit_node.set('id', vlan.id)
+        ET.SubElement(edit_node, "privateIpv4PrefixSize").text =\
+            vlan.private_ipv4_range_size
+
+        self.connection.request_with_orgId_api_2(
+            'network/expandVlan',
+            method='POST',
+            data=ET.tostring(edit_node)).object
+
+        return vlan
+
+    def ex_delete_vlan(self, vlan):
+        delete_node = ET.Element('deleteVlan', {'xmlns': TYPES_URN})
+        delete_node.set('id', vlan.id)
+        result = self.connection.request_with_orgId_api_2(
+            'network/deleteVlan',
+            method='POST',
+            data=ET.tostring(delete_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_list_vlans(self, location=None, network_domain=None):
         """
         List VLANs available in a given networkDomain
@@ -422,11 +616,190 @@ def ex_list_vlans(self, location=None, network_domain=None):
                                   .object
         return self._to_vlans(response)
 
+    def ex_add_public_ip_block_to_network_domain(self, network_domain):
+        add_node = ET.Element('addPublicIpBlock', {'xmlns': TYPES_URN})
+        ET.SubElement(add_node, "networkDomainId").text =\
+            network_domain.id
+
+        response = self.connection.request_with_orgId_api_2(
+            'network/addPublicIpBlock',
+            method='POST',
+            data=ET.tostring(add_node)).object
+
+        block_id = None
+
+        for info in findall(response, 'info', TYPES_URN):
+            if info.get('name') == 'publicIpBlockId':
+                block_id = info.get('value')
+        return self.ex_get_public_ip_block(block_id)
+
+    def ex_list_public_ip_blocks(self, network_domain):
+        params = {}
+        params['networkDomainId'] = network_domain.id
+
+        response = self.connection \
+            .request_with_orgId_api_2('network/publicIpBlock',
+                                      params=params).object
+        return self._to_ip_blocks(response)
+
+    def ex_get_public_ip_block(self, block_id):
+        locations = self.list_locations()
+        block = self.connection.request_with_orgId_api_2(
+            'network/publicIpBlock/%s' % block_id).object
+        return self._to_ip_block(block, locations)
+
+    def ex_delete_public_ip_block(self, block):
+        delete_node = ET.Element('removePublicIpBlock', {'xmlns': TYPES_URN})
+        delete_node.set('id', block.id)
+        result = self.connection.request_with_orgId_api_2(
+            'network/removePublicIpBlock',
+            method='POST',
+            data=ET.tostring(delete_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_get_node_by_id(self, id):
         node = self.connection.request_with_orgId_api_2(
             'server/server/%s' % id).object
         return self._to_node(node)
 
+    def ex_list_firewall_rules(self, network_domain):
+        params = {}
+        params['networkDomainId'] = network_domain.id
+
+        response = self.connection \
+            .request_with_orgId_api_2('network/firewallRule',
+                                      params=params).object
+        return self._to_firewall_rules(response, network_domain)
+
+    def ex_create_firewall_rule(self, network_domain, rule, position):
+        create_node = ET.Element('createFirewallRule', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node, "networkDomainId").text = network_domain.id
+        ET.SubElement(create_node, "name").text = rule.name
+        ET.SubElement(create_node, "action").text = rule.action
+        ET.SubElement(create_node, "ipVersion").text = rule.ip_version
+        ET.SubElement(create_node, "protocol").text = rule.protocol
+        # Setup source port rule
+        source = ET.SubElement(create_node, "source")
+        source_ip = ET.SubElement(source, 'ip')
+        if rule.source.any_ip:
+            source_ip.set('address', 'ANY')
+        else:
+            source_ip.set('address', rule.source.ip_address)
+            source_ip.set('prefixSize', rule.source.ip_prefix_size)
+            source_port = ET.SubElement(source, 'port')
+            source_port.set('begin', rule.source.port_begin)
+            if rule.source.port_end is not None:
+                source_port.set('end', rule.source.port_end)
+        # Setup destination port rule
+        dest = ET.SubElement(create_node, "destination")
+        dest_ip = ET.SubElement(dest, 'ip')
+        if rule.destination.any_ip:
+            dest_ip.set('address', 'ANY')
+        else:
+            dest_ip.set('address', rule.destination.ip_address)
+            dest_ip.set('prefixSize', rule.destination.ip_prefix_size)
+            dest_port = ET.SubElement(dest, 'port')
+            dest_port.set('begin', rule.destination.port_begin)
+            if rule.destination.port_end is not None:
+                dest_port.set('end', rule.destination.port_end)
+        ET.SubElement(create_node, "enabled").text = 'true'
+        placement = ET.SubElement(create_node, "placement")
+        placement.set('position', position)
+
+        response = self.connection.request_with_orgId_api_2(
+            'network/createFirewallRule',
+            method='POST',
+            data=ET.tostring(create_node)).object
+
+        rule_id = None
+        for info in findall(response, 'info', TYPES_URN):
+            if info.get('name') == 'firewallRuleId':
+                rule_id = info.get('value')
+        rule.id = rule_id
+        return rule
+
+    def ex_get_firewall_rule(self, network_domain, rule_id):
+        locations = self.list_locations()
+        rule = self.connection.request_with_orgId_api_2(
+            'network/firewallRule/%s' % rule_id).object
+        return self._to_firewall_rule(rule, locations, network_domain)
+
+    def ex_set_firewall_rule_state(self, rule, state):
+        """
+        Change the state (enabled or disabled) of a rule
+        """
+        update_node = ET.Element('editFirewallrule', {'xmlns': TYPES_URN})
+        update_node.set('id', rule.id)
+        ET.SubElement(update_node, 'enabled').text = str(state).lower()
+        result = self.connection.request_with_orgId_api_2(
+            'network/editFirewallRule',
+            method='POST',
+            data=ET.tostring(update_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
+    def ex_delete_firewall_rule(self, rule):
+        update_node = ET.Element('deleteFirewallrule', {'xmlns': TYPES_URN})
+        update_node.set('id', rule.id)
+        result = self.connection.request_with_orgId_api_2(
+            'network/deleteFirewallRule',
+            method='POST',
+            data=ET.tostring(update_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
+    def ex_create_nat_rule(self, network_domain, internal_ip, external_ip):
+        create_node = ET.Element('createNatRule', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node, 'networkDomainId').text = network_domain.id
+        ET.SubElement(create_node, 'internalIp').text = internal_ip
+        ET.SubElement(create_node, 'externalIp').text = external_ip
+        result = self.connection.request_with_orgId_api_2(
+            'network/createNatRule',
+            method='POST',
+            data=ET.tostring(create_node)).object
+
+        rule_id = None
+        for info in findall(result, 'info', TYPES_URN):
+            if info.get('name') == 'natRuleId':
+                rule_id = info.get('value')
+
+        return DimensionDataNatRule(
+            id=rule_id,
+            network_domain=network_domain,
+            internal_ip=internal_ip,
+            external_ip=external_ip,
+            status=NodeState.RUNNING
+        )
+
+    def ex_list_nat_rules(self, network_domain):
+        params = {}
+        params['networkDomainId'] = network_domain.id
+
+        response = self.connection \
+            .request_with_orgId_api_2('network/natRule',
+                                      params=params).object
+        return self._to_nat_rules(response, network_domain)
+
+    def ex_get_nat_rule(self, network_domain, rule_id):
+        rule = self.connection.request_with_orgId_api_2(
+            'network/natRule/%s' % rule_id).object
+        return self._to_nat_rule(rule, network_domain)
+
+    def ex_delete_nat_rule(self, rule):
+        update_node = ET.Element('deleteNatrule', {'xmlns': TYPES_URN})
+        update_node.set('id', rule.id)
+        result = self.connection.request_with_orgId_api_2(
+            'network/deleteNatRule',
+            method='POST',
+            data=ET.tostring(update_node)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_get_location_by_id(self, id):
         """
         Get location by ID.
@@ -442,6 +815,91 @@ def ex_get_location_by_id(self, id):
                 filter(lambda x: x.id == id, self.list_locations()))[0]
         return location
 
+    def _to_nat_rules(self, object, network_domain):
+        rules = []
+        for element in findall(object, 'natRule', TYPES_URN):
+            rules.append(
+                self._to_nat_rule(element, network_domain))
+
+        return rules
+
+    def _to_nat_rule(self, element, network_domain):
+        status = self._to_status(element.find(fixxpath('state', TYPES_URN)))
+
+        return DimensionDataNatRule(
+            id=element.get('id'),
+            network_domain=network_domain,
+            internal_ip=findtext(element, 'internalIp', TYPES_URN),
+            external_ip=findtext(element, 'externalIp', TYPES_URN),
+            status=status)
+
+    def _to_firewall_rules(self, object, network_domain):
+        rules = []
+        locations = self.list_locations()
+        for element in findall(object, 'firewallRule', TYPES_URN):
+            rules.append(
+                self._to_firewall_rule(element, locations, network_domain))
+
+        return rules
+
+    def _to_firewall_rule(self, element, locations, network_domain):
+        status = self._to_status(element.find(fixxpath('state', TYPES_URN)))
+
+        location_id = element.get('datacenterId')
+        location = list(filter(lambda x: x.id == location_id,
+                               locations))[0]
+
+        return DimensionDataFirewallRule(
+            id=element.get('id'),
+            network_domain=network_domain,
+            name=findtext(element, 'name', TYPES_URN),
+            action=findtext(element, 'action', TYPES_URN),
+            ip_version=findtext(element, 'ipVersion', TYPES_URN),
+            protocol=findtext(element, 'protocol', TYPES_URN),
+            enabled=findtext(element, 'enabled', TYPES_URN),
+            source=self._to_firewall_address(
+                element.find(fixxpath('source', TYPES_URN))),
+            destination=self._to_firewall_address(
+                element.find(fixxpath('destination', TYPES_URN))),
+            location=location,
+            status=status)
+
+    def _to_firewall_address(self, element):
+        ip = element.find(fixxpath('ip', TYPES_URN))
+        port = element.find(fixxpath('port', TYPES_URN))
+        return DimensionDataFirewallAddress(
+            any_ip=ip.get('address') == 'ANY',
+            ip_address=ip.get('address'),
+            ip_prefix_size=ip.get('prefixSize'),
+            port_begin=port.get('begin') if port is not None else None,
+            port_end=port.get('end') if port is not None else None
+        )
+
+    def _to_ip_blocks(self, object):
+        blocks = []
+        locations = self.list_locations()
+        for element in findall(object, 'publicIpBlock', TYPES_URN):
+            blocks.append(self._to_ip_block(element, locations))
+
+        return blocks
+
+    def _to_ip_block(self, element, locations):
+        status = self._to_status(element.find(fixxpath('state', TYPES_URN)))
+
+        location_id = element.get('datacenterId')
+        location = list(filter(lambda x: x.id == location_id,
+                               locations))[0]
+
+        return DimensionDataPublicIpBlock(
+            id=element.get('id'),
+            network_domain=self.ex_get_network_domain(
+                findtext(element, 'networkDomainId', TYPES_URN)
+            ),
+            base_ip=findtext(element, 'baseIp', TYPES_URN),
+            size=findtext(element, 'size', TYPES_URN),
+            location=location,
+            status=status)
+
     def _to_networks(self, object):
         networks = []
         locations = self.list_locations()
@@ -486,12 +944,16 @@ def _to_network_domain(self, element, locations):
         location_id = element.get('datacenterId')
         location = list(filter(lambda x: x.id == location_id,
                                locations))[0]
-
+        plan = findtext(element, 'type', TYPES_URN)
+        if plan is 'ESSENTIALS':
+            plan_type = NetworkDomainServicePlan.ESSENTIALS
+        else:
+            plan_type = NetworkDomainServicePlan.ADVANCED
         return DimensionDataNetworkDomain(
             id=element.get('id'),
             name=findtext(element, 'name', TYPES_URN),
-            description=findtext(element, 'description',
-                                 TYPES_URN),
+            description=findtext(element, 'description', TYPES_URN),
+            plan=plan_type,
             location=location,
             status=status)
 
@@ -509,12 +971,14 @@ def _to_vlan(self, element, locations):
         location_id = element.get('datacenterId')
         location = list(filter(lambda x: x.id == location_id,
                                locations))[0]
-
+        ip_range = element.find(fixxpath('privateIpv4Range', TYPES_URN))
         return DimensionDataVlan(
             id=element.get('id'),
             name=findtext(element, 'name', TYPES_URN),
             description=findtext(element, 'description',
                                  TYPES_URN),
+            private_ipv4_range_address=ip_range.get('address'),
+            private_ipv4_range_size=ip_range.get('prefixSize'),
             location=location,
             status=status)
 
diff --git a/libcloud/loadbalancer/drivers/dimensiondata.py b/libcloud/loadbalancer/drivers/dimensiondata.py
index bd72e7fa4a..da5b45ea68 100644
--- a/libcloud/loadbalancer/drivers/dimensiondata.py
+++ b/libcloud/loadbalancer/drivers/dimensiondata.py
@@ -274,8 +274,8 @@ def balancer_detach_member(self, balancer, member):
             'networkDomainVip/removePoolMember',
             method='POST',
             data=ET.tostring(create_pool_m)).object
-        responseCode = findtext(result, 'responseCode', TYPES_URN)
-        return responseCode == 'OK'
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def destroy_balancer(self, balancer):
         """
@@ -295,8 +295,8 @@ def destroy_balancer(self, balancer):
             'networkDomainVip/deleteVirtualListener',
             method='POST',
             data=ET.tostring(delete_listener)).object
-        responseCode = findtext(result, 'responseCode', TYPES_URN)
-        return responseCode == 'OK'
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_set_current_network_domain(self, network_domain_id):
         """
@@ -423,6 +423,51 @@ def ex_create_node(self,
             ip=ip
         )
 
+    def ex_update_node(self, node):
+        """
+        Update the properties of a node
+
+        :param pool: The instance of ``DimensionDataNode`` to update
+        :type  pool: ``DimensionDataNode``
+
+        :return: The instance of ``DimensionDataNode``
+        :rtype: ``DimensionDataNode``
+        """
+        create_node_elm = ET.Element('editNode', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node_elm, "connectionLimit") \
+            .text = str(node.connection_limit)
+        ET.SubElement(create_node_elm, "connectionRateLimit") \
+            .text = str(node.connection_rate_limit)
+
+        self.connection.request_with_orgId_api_2(
+            action='networkDomainVip/createNode',
+            method='POST',
+            data=ET.tostring(create_node_elm)).object
+        return node
+
+    def ex_set_node_state(self, node, enabled):
+        """
+        Change the state of a node (enable/disable)
+
+        :param pool: The instance of ``DimensionDataNode`` to update
+        :type  pool: ``DimensionDataNode``
+
+        :param enabled: The target state of the node
+        :type  enabled: ``bool``
+
+        :return: The instance of ``DimensionDataNode``
+        :rtype: ``DimensionDataNode``
+        """
+        create_node_elm = ET.Element('editNode', {'xmlns': TYPES_URN})
+        ET.SubElement(create_node_elm, "status") \
+            .text = "ENABLED" if enabled is True else "DISABLED"
+
+        self.connection.request_with_orgId_api_2(
+            action='networkDomainVip/editNode',
+            method='POST',
+            data=ET.tostring(create_node_elm)).object
+        return node
+
     def ex_create_pool(self,
                        network_domain_id,
                        name,
@@ -484,7 +529,11 @@ def ex_create_pool(self,
             id=pool_id,
             name=name,
             description=ex_description,
-            status=State.RUNNING
+            status=State.RUNNING,
+            load_balance_method=str(balancer_method),
+            health_monitor_id=None,
+            service_down_action=service_down_action,
+            slow_ramp_time=str(slow_ramp_time)
         )
 
     def ex_create_virtual_listener(self,
@@ -607,6 +656,33 @@ def ex_get_pool(self, pool_id):
                                       % pool_id).object
         return self._to_pool(pool)
 
+    def ex_update_pool(self, pool):
+        """
+        Update the properties of an existing pool
+        only method, serviceDownAction and slowRampTime are updated
+
+        :param pool: The instance of ``DimensionDataPool`` to update
+        :type  pool: ``DimensionDataPool``
+
+        :return: ``True`` for success, ``False`` for failure
+        :rtype: ``bool``
+        """
+        create_node_elm = ET.Element('editPool', {'xmlns': TYPES_URN})
+
+        ET.SubElement(create_node_elm, "loadBalanceMethod") \
+            .text = str(pool.load_balance_method)
+        ET.SubElement(create_node_elm, "serviceDownAction") \
+            .text = pool.service_down_action
+        ET.SubElement(create_node_elm, "slowRampTime").text \
+            = str(pool.slow_ramp_time)
+
+        response = self.connection.request_with_orgId_api_2(
+            action='networkDomainVip/editPool',
+            method='POST',
+            data=ET.tostring(create_node_elm)).object
+        response_code = findtext(response, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_destroy_pool(self, pool):
         """
         Destroy an existing pool
@@ -625,8 +701,8 @@ def ex_destroy_pool(self, pool):
             action='networkDomainVip/deletePool',
             method='POST',
             data=ET.tostring(destroy_request)).object
-        responseCode = findtext(result, 'responseCode', TYPES_URN)
-        return responseCode == 'OK'
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_get_pool_members(self, pool_id):
         """
@@ -658,6 +734,21 @@ def ex_get_pool_member(self, pool_member_id):
                                       % pool_member_id).object
         return self._to_member(member)
 
+    def ex_set_pool_member_state(self, member, enabled=True):
+        request = ET.Element('editPoolMember',
+                             {'xmlns': TYPES_URN,
+                              'id': member.id})
+        state = "ENABLED" if enabled is True else "DISABLED"
+        ET.SubElement(request, 'status').text = state
+
+        result = self.connection.request_with_orgId_api_2(
+            action='networkDomainVip/editPoolMember',
+            method='POST',
+            data=ET.tostring(request)).object
+
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
+
     def ex_destroy_pool_member(self, member, destroy_node=False):
         """
         Destroy a specific member of a pool
@@ -684,8 +775,8 @@ def ex_destroy_pool_member(self, member, destroy_node=False):
         if member.node_id is not None and destroy_node is True:
             return self.ex_destroy_node(member.node_id)
         else:
-            responseCode = findtext(result, 'responseCode', TYPES_URN)
-            return responseCode == 'OK'
+            response_code = findtext(result, 'responseCode', TYPES_URN)
+            return response_code in ['IN_PROGRESS', 'OK']
 
     def ex_get_nodes(self):
         """
@@ -698,6 +789,18 @@ def ex_get_nodes(self):
             .request_with_orgId_api_2('networkDomainVip/node').object
         return self._to_nodes(nodes)
 
+    def ex_get_node(self, node_id):
+        """
+        Get the node specified by node_id
+
+        :return: Returns an instance of ``DimensionDataVIPNode``
+        :rtype: Instance of ``DimensionDataVIPNode``
+        """
+        nodes = self.connection \
+            .request_with_orgId_api_2('networkDomainVip/node/%s'
+                                      % node_id).object
+        return self._to_node(nodes)
+
     def ex_destroy_node(self, node_id):
         """
         Destroy a specific node
@@ -717,8 +820,8 @@ def ex_destroy_node(self, node_id):
             action='networkDomainVip/deleteNode',
             method='POST',
             data=ET.tostring(destroy_request)).object
-        responseCode = findtext(result, 'responseCode', TYPES_URN)
-        return responseCode == 'OK'
+        response_code = findtext(result, 'responseCode', TYPES_URN)
+        return response_code in ['IN_PROGRESS', 'OK']
 
     def _to_nodes(self, object):
         nodes = []
@@ -740,6 +843,9 @@ def _to_node(self, element):
             status=self._VALUE_TO_STATE_MAP.get(
                 findtext(element, 'state', TYPES_URN),
                 State.UNKNOWN),
+            connection_rate_limit=findtext(element,
+                                           'connectionRateLimit', TYPES_URN),
+            connection_limit=findtext(element, 'connectionLimit', TYPES_URN),
             ip=ipaddress)
 
         return node
@@ -816,6 +922,12 @@ def _to_pool(self, element):
             id=element.get('id'),
             name=findtext(element, 'name', TYPES_URN),
             status=findtext(element, 'state', TYPES_URN),
-            description=findtext(element, 'description', TYPES_URN)
+            description=findtext(element, 'description', TYPES_URN),
+            load_balance_method=findtext(element, 'loadBalanceMethod',
+                                         TYPES_URN),
+            health_monitor_id=findtext(element, 'healthMonitorId', TYPES_URN),
+            service_down_action=findtext(element, 'serviceDownAction',
+                                         TYPES_URN),
+            slow_ramp_time=findtext(element, 'slowRampTime', TYPES_URN),
         )
         return pool
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
new file mode 100644
index 0000000000..1fcb8d354f
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="na/2014-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
+<operation>ADD_PUBLIC_IP_BLOCK</operation>
+<responseCode>OK</responseCode>
+<message>Public IPv4 Address Block has been added successfully to Network Domain.</message>
+<info name="publicIpBlockId" value="4487241a-f0ca-11e3-9315-d4bed9b167ba"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
new file mode 100644
index 0000000000..ac3162ec75
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-06T02:28:56.679-05:00/1003070b-dea9-41bd-9f0c-5c24086589b8">
+<operation>CREATE_FIREWALL_RULE</operation>
+<responseCode>OK</responseCode>
+<message>Request create Firewall Rule 'My.Rule.2' successful</message>
+<info name="firewallRuleId" value="d0a20f59-77b9-4f28-a63b-e58496b73a6c"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
new file mode 100644
index 0000000000..ff652a4b8c
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-06T05:53:37.334-05:00/fb842265-fa06-4ca9-a2af-a8a6815735fc">
+<operation>CREATE_NAT_RULE</operation>
+<responseCode>OK</responseCode>
+<message>NAT Rule with Id d31c2db0-be6b-4d50-8744-9a7a534b5fba has been
+created.</message>
+<info name="natRuleId" value="d31c2db0-be6b-4d50-8744-9a7a534b5fba"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
new file mode 100644
index 0000000000..3016297aa0
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="NA9/2015-03-06T04:49:42.721-05:00/f69f1106-0df7-4614-b517-844ce29013e4"
+xmlns="urn:didata.com:api:cloud:types">
+<operation>DELETE_FIREWALL_RULE</operation>
+<responseCode>OK</responseCode>
+<message>Firewall Rule (Id:84e34850-595d-436e-a885-7cd37edb24a4) has been
+deleted</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
new file mode 100644
index 0000000000..2d2cebce24
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-06T12:24:57.820-05:00/5974fe37-bac5-4345-8a88-4c93a874bf4a">
+<operation>DELETE_NAT_RULE</operation>
+<responseCode>OK</responseCode>
+<message>NAT Rule with Id 2187a636-7ebb-49a1-a2ff-5d617f496dce has been
+deleted.</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
new file mode 100644
index 0000000000..a3cca2ed2a
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-24T10:19:41.471-05:00/27083502-a2ea-4331-b0cb-c2a11bb044b0">
+<operation>DELETE_NETWORK_DOMAIN</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to Delete Network Domain (Id: 8cdfd607-f429-4df6-9352-
+162cfc0891be) has been accepted and is being processed</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
new file mode 100644
index 0000000000..9eae809721
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="NA9/2014-04-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e"
+xmlns="urn:didata.com:api:cloud:types">
+<operation>DELETE_VLAN</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to Delete VLAN (Id:0e56433f-d808-4669-821d-812769517ff8)
+has been accepted and is being processed</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
new file mode 100644
index 0000000000..4269840867
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response requestId="na/2015-01-14T13:37:20/62f06368-c3fb-11e3-b29c-001517c4643e" xmlns="urn:didata.com:api:cloud:types">
+<operation>DEPLOY_NETWORK_DOMAIN</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to Deploy Network Domain 'A Network Domain' has been
+accepted and is being processed</message>
+<info name="networkDomainId" value="f14a871f-9a25-470c-aef8-51e13202e1aa"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
new file mode 100644
index 0000000000..eb37402b18
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-13T05:58:00.905-05:00/04a82e12-2d51-420e-84f5-bf2630c5a5e5">
+<operation>DEPLOY_VLAN</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to deploy VLAN 'Production VLAN' has been accepted and is
+being processed.</message>
+<info name="vlanId" value="cee8df03-9117-44cc-baaa-631ffa099683"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
new file mode 100644
index 0000000000..eff18c4864
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-06T03:34:21.951-05:00/d7e37b41-ceff-4a8c-992d-a0220b8ebd76">
+<operation>EDIT_FIREWALL_RULE</operation>
+<responseCode>OK</responseCode>
+<message>Firewall Rule with id 1aa3d0ce-d95d-4296-8338-9717e0d37ff9 has
+been edited</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
new file mode 100644
index 0000000000..07d55e5689
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-24T09:05:41.790-05:00/b24cbc7d-0648-4070-889f-7ab97bf21941">
+<operation>EDIT_NETWORK_DOMAIN</operation>
+<responseCode>OK</responseCode>
+<message>Network Domain 'Development Network Domain' was edited
+successfully.</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
new file mode 100644
index 0000000000..10d0010ca9
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-25T06:55:10.939-05:00/0593b9af-6b0c-4e5b-8e74-57b0e752f2bf">
+<operation>EDIT_VLAN</operation>
+<responseCode>OK</responseCode>
+<message>VLAN 'test' was edited successfully</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
new file mode 100644
index 0000000000..03f91125df
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-13T05:58:00.905-05:00/04a82e12-2d51-420e-84f5-bf2630c5a5e5">
+<operation>EXPAND_VLAN</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to expand VLAN 'Production VLAN' has been accepted and is
+being processed.</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
new file mode 100644
index 0000000000..b09d9639b7
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml
@@ -0,0 +1,210 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<firewallRules xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="13" totalCount="13" pageSize="50">
+    <firewallRule id="756cba02-b0bc-48f4-aea5-9445870b6148" datacenterId="NA9" ruleType="DEFAULT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>CCDEFAULT.BlockOutboundMailIPv4</name>
+        <action>DROP</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="25"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="8ffbe8c1-e545-424b-bfcc-e25c2017537d" datacenterId="NA9" ruleType="DEFAULT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>CCDEFAULT.BlockOutboundMailIPv4Secure</name>
+        <action>DROP</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="587"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="f93b5139-402b-45c5-af80-aa00e311572e" datacenterId="NA9" ruleType="DEFAULT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>CCDEFAULT.BlockOutboundMailIPv6</name>
+        <action>DROP</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="25"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="83ade810-3983-4009-a250-155c5ab47f54" datacenterId="NA9" ruleType="DEFAULT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>CCDEFAULT.BlockOutboundMailIPv6Secure</name>
+        <action>DROP</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="587"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="cc9e1475-9218-484d-af5f-aba5c9a37c2d" datacenterId="NA9" ruleType="DEFAULT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>CCDEFAULT.DenyExternalInboundIPv6</name>
+        <action>DROP</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>IP</protocol>
+        <source>
+            <ip address="EXTERNAL_IPV6"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="a23db203-99c9-42de-9dce-3a97724b7d4d" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>AllowOctopusTentacleComms6</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
+            <port begin="10933"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="bc26b74f-9b52-4923-8eda-7fc434759611" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>AllowOctopusComms4</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="10933"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="0bb8cc91-75fd-48a1-b9f8-1d728dabbca1" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>AllowHTTPSinbound</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="38ff959f-58c5-47b9-af6b-568a23e3c299" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>AllowHTTPSinbound6</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
+            <port begin="443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="04159804-e48c-40b5-80f5-48c40d1b7f2f" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>Allow8843Inbound</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="8443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="4250d8db-db42-4e40-acb0-672ec1a1af1b" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>Allow9443Inbound</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV4</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="ANY"/>
+            <port begin="9443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="f0119d2f-e891-44ee-af89-76122b4be219" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>Allow9443Inbound6</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
+            <port begin="8443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+    <firewallRule id="b976e0e6-4fb2-4f3e-a016-652e02d191b4" datacenterId="NA9" ruleType="CLIENT_RULE">
+        <networkDomainId>b30c224c-c95b-4cd9-bb8b-bfdfb5486abf</networkDomainId>
+        <name>AllowSTSInbound6</name>
+        <action>ACCEPT_DECISIVELY</action>
+        <ipVersion>IPV6</ipVersion>
+        <protocol>TCP</protocol>
+        <source>
+            <ip address="ANY"/>
+        </source>
+        <destination>
+            <ip address="2607:f480:111:1336:6503:544c:74a6:3a28"/>
+            <port begin="9443"/>
+        </destination>
+        <enabled>true</enabled>
+        <state>NORMAL</state>
+    </firewallRule>
+</firewallRules>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
new file mode 100644
index 0000000000..876f37d744
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<firewallRule
+xmlns="urn:didata.com:api:cloud:types" id="d0a20f59-77b9-4f28-a63b-e58496b73a6c" datacenterId="NA9" ruleType="DEFAULT_RULE">
+<networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
+<name>CCDEFAULT.BlockOutboundMailIPv4</name>
+<action>DROP</action>
+<ipVersion>IPV4</ipVersion>
+<protocol>TCP</protocol>
+<source>
+<ip address="ANY"/>
+</source>
+<destination>
+<ip address="ANY"/>
+<port begin="25"/>
+</destination>
+<enabled>true</enabled>
+<state>NORMAL</state>
+</firewallRule>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
new file mode 100644
index 0000000000..7478df6b43
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<natRules
+xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="2"
+totalCount="2" pageSize="250">
+<natRule id="2187a636-7ebb-49a1-a2ff-5d617f496dce" datacenterId="NA9">
+<networkDomainId>484174a2-ae74-4658-9e56-
+50fc90e086cf</networkDomainId>
+<internalIp>10.0.0.15</internalIp>
+<externalIp>165.180.12.18</externalIp>
+<createTime>2015-03-06T13:43:45.000Z</createTime>
+<state>NORMAL</state>
+</natRule>
+<natRule id="2169a38e-5692-497e-a22a-701a838a6539" datacenterId="NA9">
+<networkDomainId>484174a2-ae74-4658-9e56-
+50fc90e086cf</networkDomainId>
+<internalIp>10.0.0.16</internalIp>
+<externalIp>165.180.12.19</externalIp>
+<createTime>2015-03-06T13:45:10.000Z</createTime>
+<state>NORMAL</state>
+</natRule>
+</natRules>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
new file mode 100644
index 0000000000..6bf447d7e3
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<natRule
+xmlns="urn:didata.com:api:cloud:types" id="2187a636-7ebb-49a1-a2ff-5d617f496dce" datacenterId="NA9">
+<networkDomainId>484174a2-ae74-4658-9e56-50fc90e086cf</networkDomainId>
+<internalIp>10.0.0.16</internalIp>
+<externalIp>165.180.12.19</externalIp>
+<createTime>2015-03-06T13:45:10.000Z</createTime>
+<state>NORMAL</state>
+</natRule>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
new file mode 100644
index 0000000000..bdd1c6b42f
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<networkDomain xmlns="urn:didata.com:api:cloud:types" id="8cdfd607-f429-4df6-9352-162cfc0891be" datacenterId="NA12">
+    <name>test</name>
+    <description>test2</description>
+    <type>ESSENTIALS</type>
+    <snatIpv4Address>168.128.26.20</snatIpv4Address>
+    <createTime>2015-07-15T03:36:00.000Z</createTime>
+    <state>NORMAL</state>
+</networkDomain>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
new file mode 100644
index 0000000000..3a1c1b381d
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publicIpBlocks xmlns="urn:didata.com:api:cloud:types" pageNumber="1" pageCount="1" totalCount="1" pageSize="250">
+    <publicIpBlock id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
+        <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
+        <baseIp>168.128.4.18</baseIp>
+        <size>2</size>
+        <createTime>2015-07-13T04:07:37.000Z</createTime>
+        <state>NORMAL</state>
+    </publicIpBlock>
+</publicIpBlocks>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
new file mode 100644
index 0000000000..dc8814b47c
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publicIpBlock xmlns="urn:didata.com:api:cloud:types" id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
+    <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
+    <baseIp>168.128.4.18</baseIp>
+    <size>2</size>
+    <createTime>2015-07-13T04:07:37.000Z</createTime>
+    <state>NORMAL</state>
+</publicIpBlock>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
new file mode 100644
index 0000000000..dc8814b47c
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<publicIpBlock xmlns="urn:didata.com:api:cloud:types" id="9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8" datacenterId="NA9">
+    <networkDomainId>8cdfd607-f429-4df6-9352-162cfc0891be</networkDomainId>
+    <baseIp>168.128.4.18</baseIp>
+    <size>2</size>
+    <createTime>2015-07-13T04:07:37.000Z</createTime>
+    <state>NORMAL</state>
+</publicIpBlock>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
new file mode 100644
index 0000000000..8b6fe34e2a
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-02-27T09:31:34.239-05:00/3e762559-c7f5-4d2b-abab-63306d406aa1">
+<operation>REMOVE_PUBLIC_IP_BLOCK</operation>
+<responseCode>OK</responseCode>
+<message>Public Ip Block bef4334a-844b-11e4-a91c-0030487e0302 has been
+removed successfully</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
new file mode 100644
index 0000000000..1b64756907
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<vlan
+xmlns="urn:didata.com:api:cloud:types" id="0e56433f-d808-4669-821d-812769517ff8" datacenterId="NA9">
+<networkDomain id="484174a2-ae74-4658-9e56-50fc90e086cf" name="Production
+Network Domain"/>
+<name>Production VLAN</name>
+<description>test2</description>
+<privateIpv4Range address="10.0.3.0" prefixSize="24"/>
+<ipv4GatewayAddress>10.0.3.1</ipv4GatewayAddress>
+<ipv6Range address="2607:f480:1111:1153:0:0:0:0" prefixSize="64"/>
+<ipv6GatewayAddress>2607:f480:1111:1153:0:0:0:1</ipv6GatewayAddress>
+<createTime>2015-02-13T10:56:44.000Z</createTime>
+<state>NORMAL</state>
+</vlan>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
new file mode 100644
index 0000000000..56eeb024b2
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-08T06:17:52.133-04:00/70e7458c-038c-4819-a1de-90d15007c2f5">
+<operation>ADD_NIC</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>The request to add NIC for VLAN 'Subsystem VLAN' on Server
+'Production Mail Server' has been accepted and is being processed..</message>
+<info name="nicId" value="a202e51b-41c0-4cfc-add0-b1c62fc0ecf6"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
new file mode 100644
index 0000000000..61be4e32f1
--- /dev/null
+++ b/libcloud/test/compute/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-03-08T06:57:51.297-04:00/6857b7e6-e3a9-438c-87fe-ed2248c65c55">
+<operation>REMOVE_NIC</operation>
+<responseCode>IN_PROGRESS</responseCode>
+<message>Request to Remove NIC 5999db1d-725c-46ba-9d4e-d33991e61ab1 for
+VLAN 'Subsystem VLAN' from Server 'Production Mail Server' has been accepted
+and is being processed.</message>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/compute/test_dimensiondata.py b/libcloud/test/compute/test_dimensiondata.py
index b5d481d900..af436de4e4 100644
--- a/libcloud/test/compute/test_dimensiondata.py
+++ b/libcloud/test/compute/test_dimensiondata.py
@@ -17,7 +17,7 @@
 from libcloud.utils.py3 import httplib
 
 from libcloud.common.types import InvalidCredsError
-from libcloud.common.dimensiondata import DimensionDataAPIException
+from libcloud.common.dimensiondata import DimensionDataAPIException, NetworkDomainServicePlan
 from libcloud.compute.drivers.dimensiondata import DimensionDataNodeDriver as DimensionData
 from libcloud.compute.base import Node, NodeAuthPassword, NodeLocation
 
@@ -196,11 +196,48 @@ def test_ex_reset(self):
         ret = self.driver.ex_reset(node)
         self.assertTrue(ret is True)
 
+    def test_ex_attach_node_to_vlan(self):
+        node = self.driver.ex_get_node_by_id('e75ead52-692f-4314-8725-c8a4f4d13a87')
+        vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
+        ret = self.driver.ex_attach_node_to_vlan(node, vlan)
+        self.assertTrue(ret)
+
+    def test_ex_destroy_nic(self):
+        node = self.driver.ex_destroy_nic('a202e51b-41c0-4cfc-add0-b1c62fc0ecf6')
+        self.assertTrue(node)
+
     def test_list_networks(self):
         nets = self.driver.list_networks()
         self.assertEqual(nets[0].name, 'test-net1')
         self.assertTrue(isinstance(nets[0].location, NodeLocation))
 
+    def test_ex_create_network_domain(self):
+        location = self.driver.ex_get_location_by_id('NA9')
+        plan = NetworkDomainServicePlan.ADVANCED
+        net = self.driver.ex_create_network_domain(location=location,
+                                                   name='test',
+                                                   description='test',
+                                                   service_plan=plan)
+        self.assertEqual(net.name, 'test')
+        self.assertTrue(net.id, 'f14a871f-9a25-470c-aef8-51e13202e1aa')
+
+    def test_ex_get_network_domain(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        self.assertEqual(net.id, '8cdfd607-f429-4df6-9352-162cfc0891be')
+        self.assertEqual(net.description, 'test2')
+        self.assertEqual(net.name, 'test')
+
+    def test_ex_update_network_domain(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        net.name = 'new name'
+        net2 = self.driver.ex_update_network_domain(net)
+        self.assertEqual(net2.name, 'new name')
+
+    def test_ex_delete_network_domain(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        result = self.driver.ex_delete_network_domain(net)
+        self.assertTrue(result)
+
     def test_ex_list_networks(self):
         nets = self.driver.ex_list_networks()
         self.assertEqual(nets[0].name, 'test-net1')
@@ -215,6 +252,128 @@ def test_ex_list_vlans(self):
         vlans = self.driver.ex_list_vlans()
         self.assertEqual(vlans[0].name, "Primary")
 
+    def test_ex_create_vlan(self,):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        vlan = self.driver.ex_create_vlan(network_domain=net,
+                                          name='test',
+                                          private_ipv4_base_address='10.3.4.0',
+                                          private_ipv4_prefix_size='24')
+        self.assertEqual(vlan.id, 'cee8df03-9117-44cc-baaa-631ffa099683')
+
+    def test_ex_get_vlan(self):
+        vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
+        self.assertEqual(vlan.id, '0e56433f-d808-4669-821d-812769517ff8')
+        self.assertEqual(vlan.description, 'test2')
+        self.assertEqual(vlan.name, 'Production VLAN')
+        self.assertEqual(vlan.private_ipv4_range_address, '10.0.3.0')
+        self.assertEqual(vlan.private_ipv4_range_size, '24')
+
+    def test_ex_update_vlan(self):
+        vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
+        vlan.name = 'new name'
+        vlan2 = self.driver.ex_update_vlan(vlan)
+        self.assertEqual(vlan2.name, 'new name')
+
+    def test_ex_delete_vlan(self):
+        vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
+        result = self.driver.ex_delete_vlan(vlan)
+        self.assertTrue(result)
+
+    def test_ex_expand_vlan(self):
+        vlan = self.driver.ex_get_vlan('0e56433f-d808-4669-821d-812769517ff8')
+        vlan.private_ipv4_range_size = '23'
+        vlan = self.driver.ex_expand_vlan(vlan)
+        self.assertEqual(vlan.private_ipv4_range_size, '23')
+
+    def test_ex_add_public_ip_block_to_network_domain(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        block = self.driver.ex_add_public_ip_block_to_network_domain(net)
+        self.assertEqual(block.id, '9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8')
+
+    def test_ex_list_public_ip_blocks(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        blocks = self.driver.ex_list_public_ip_blocks(net)
+        self.assertEqual(blocks[0].base_ip, '168.128.4.18')
+        self.assertEqual(blocks[0].size, '2')
+        self.assertEqual(blocks[0].id, '9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8')
+        self.assertEqual(blocks[0].location.id, 'NA9')
+        self.assertEqual(blocks[0].network_domain.id, net.id)
+
+    def test_ex_get_public_ip_block(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        block = self.driver.ex_get_public_ip_block('9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8')
+        self.assertEqual(block.base_ip, '168.128.4.18')
+        self.assertEqual(block.size, '2')
+        self.assertEqual(block.id, '9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8')
+        self.assertEqual(block.location.id, 'NA9')
+        self.assertEqual(block.network_domain.id, net.id)
+
+    def test_ex_delete_public_ip_block(self):
+        block = self.driver.ex_get_public_ip_block('9945dc4a-bdce-11e4-8c14-b8ca3a5d9ef8')
+        result = self.driver.ex_delete_public_ip_block(block)
+        self.assertTrue(result)
+
+    def test_ex_list_firewall_rules(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rules = self.driver.ex_list_firewall_rules(net)
+        self.assertEqual(rules[0].id, '756cba02-b0bc-48f4-aea5-9445870b6148')
+        self.assertEqual(rules[0].network_domain.id, '8cdfd607-f429-4df6-9352-162cfc0891be')
+        self.assertEqual(rules[0].name, 'CCDEFAULT.BlockOutboundMailIPv4')
+        self.assertEqual(rules[0].action, 'DROP')
+        self.assertEqual(rules[0].ip_version, 'IPV4')
+        self.assertEqual(rules[0].protocol, 'TCP')
+        self.assertEqual(rules[0].source.ip_address, 'ANY')
+        self.assertTrue(rules[0].source.any_ip)
+        self.assertTrue(rules[0].destination.any_ip)
+
+    def test_ex_create_firewall_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rules = self.driver.ex_list_firewall_rules(net)
+        rule = self.driver.ex_create_firewall_rule(net, rules[0], 'FIRST')
+        self.assertEqual(rule.id, 'd0a20f59-77b9-4f28-a63b-e58496b73a6c')
+
+    def test_ex_get_firewall_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_get_firewall_rule(net, 'd0a20f59-77b9-4f28-a63b-e58496b73a6c')
+        self.assertEqual(rule.id, 'd0a20f59-77b9-4f28-a63b-e58496b73a6c')
+
+    def test_ex_set_firewall_rule_state(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_get_firewall_rule(net, 'd0a20f59-77b9-4f28-a63b-e58496b73a6c')
+        result = self.driver.ex_set_firewall_rule_state(rule, False)
+        self.assertTrue(result)
+
+    def test_ex_delete_firewall_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_get_firewall_rule(net, 'd0a20f59-77b9-4f28-a63b-e58496b73a6c')
+        result = self.driver.ex_delete_firewall_rule(rule)
+        self.assertTrue(result)
+
+    def test_ex_create_nat_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_create_nat_rule(net, '1.2.3.4', '4.3.2.1')
+        self.assertEqual(rule.id, 'd31c2db0-be6b-4d50-8744-9a7a534b5fba')
+
+    def test_ex_list_nat_rules(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rules = self.driver.ex_list_nat_rules(net)
+        self.assertEqual(rules[0].id, '2187a636-7ebb-49a1-a2ff-5d617f496dce')
+        self.assertEqual(rules[0].internal_ip, '10.0.0.15')
+        self.assertEqual(rules[0].external_ip, '165.180.12.18')
+
+    def test_ex_get_nat_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_get_nat_rule(net, '2187a636-7ebb-49a1-a2ff-5d617f496dce')
+        self.assertEqual(rule.id, '2187a636-7ebb-49a1-a2ff-5d617f496dce')
+        self.assertEqual(rule.internal_ip, '10.0.0.16')
+        self.assertEqual(rule.external_ip, '165.180.12.19')
+
+    def test_ex_delete_nat_rule(self):
+        net = self.driver.ex_get_network_domain('8cdfd607-f429-4df6-9352-162cfc0891be')
+        rule = self.driver.ex_get_nat_rule(net, '2187a636-7ebb-49a1-a2ff-5d617f496dce')
+        result = self.driver.ex_delete_nat_rule(rule)
+        self.assertTrue(result)
+
 
 class DimensionDataMockHttp(MockHttp):
 
@@ -398,5 +557,131 @@ def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4
             'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_server_e75ead52_692f_4314_8725_c8a4f4d13a87.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployNetworkDomain.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_networkDomain_8cdfd607_f429_4df6_9352_162cfc0891be.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editNetworkDomain.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNetworkDomain.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan_0e56433f_d808_4669_821d_812769517ff8.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_addPublicIpBlock.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_publicIpBlock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_removePublicIpBlock.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createFirewallRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_firewallRule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_editFirewallRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteFirewallRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_createNatRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_natRule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_network_deleteNatRule.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+
 if __name__ == '__main__':
     sys.exit(unittest.main())
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
new file mode 100644
index 0000000000..ae3e2afe85
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
+<operation>EDIT_NODE</operation>
+<responseCode>OK</responseCode>
+<message>Node 'ProductionNode.2' has been edited successfully.</message>
+<info name="nodeId" value="34de6ed6-46a4-4dae-a753-2f8d3840c6f9"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
new file mode 100644
index 0000000000..78eb686b9a
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-05-29T11:57:29.793-04:00/9f7191df-de3a-4cf3-a0a1-6321e88b5af5">
+<operation>EDIT_POOL</operation>
+<responseCode>OK</responseCode>
+<message>Pool 'ProductionPool.2' has been updated.</message>
+<info name="name" value="ProductionPool.2"/>
+<info name="poolId" value="4d360b1f-bc2c-4ab7-9884-1f03ba2768f7"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
new file mode 100644
index 0000000000..89ce41dd6f
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<response
+xmlns="urn:didata.com:api:cloud:types" requestId="NA9/2015-06-09T09:29:46.249-04:00/c128c717-b3b4-480a-ba93-e3fb2e32a9be">
+<operation>EDIT_POOL_MEMBER</operation>
+<responseCode>OK</responseCode>
+<message>Pool Member (10.0.3.13:9889) has been edited.</message>
+<info name="poolMemberId" value="3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0"/>
+</response>
\ No newline at end of file
diff --git a/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
new file mode 100644
index 0000000000..ace9123bb9
--- /dev/null
+++ b/libcloud/test/loadbalancer/fixtures/dimensiondata/caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node xmlns="urn:didata.com:api:cloud:types" id="34de6ed6-46a4-4dae-a753-2f8d3840c6f9" datacenterId="NA9">
+<networkDomainId>553f26b6-2a73-42c3-a78b-6116f11291d0</networkDomainId>
+<name>ProductionNode.2</name>
+<description>Production Server 2</description>
+<ipv4Address>10.10.10.101</ipv4Address>
+<state>NORMAL</state>
+<status>ENABLED</status>
+<healthMonitor id="0168b83a-d487-11e4-811f-005056806999" name="ICMP"/>
+<connectionLimit>10000</connectionLimit>
+<connectionRateLimit>2000</connectionRateLimit>
+<createTime>2015-05-27T13:56:13.000Z</createTime>
+</node>
\ No newline at end of file
diff --git a/libcloud/test/loadbalancer/test_dimensiondata.py b/libcloud/test/loadbalancer/test_dimensiondata.py
index 725f153fcc..b28833b7ab 100644
--- a/libcloud/test/loadbalancer/test_dimensiondata.py
+++ b/libcloud/test/loadbalancer/test_dimensiondata.py
@@ -216,7 +216,11 @@ def test_ex_create_pool_member(self):
             id='4d360b1f-bc2c-4ab7-9884-1f03ba2768f7',
             name='test',
             description='test',
-            status=State.RUNNING
+            status=State.RUNNING,
+            health_monitor_id=None,
+            load_balance_method=None,
+            service_down_action=None,
+            slow_ramp_time=None
         )
         node = DimensionDataVIPNode(
             id='2344',
@@ -266,7 +270,11 @@ def test_ex_create_virtual_listener(self):
                 id='1234',
                 name='test',
                 description='test',
-                status=State.RUNNING
+                status=State.RUNNING,
+                health_monitor_id=None,
+                load_balance_method=None,
+                service_down_action=None,
+                slow_ramp_time=None
             ))
         self.assertEqual(listener.id, '8334f461-0df0-42d5-97eb-f4678eb26bea')
         self.assertEqual(listener.name, 'test')
@@ -281,7 +289,11 @@ def test_ex_create_virtual_listener_unusual_port(self):
                 id='1234',
                 name='test',
                 description='test',
-                status=State.RUNNING
+                status=State.RUNNING,
+                health_monitor_id=None,
+                load_balance_method=None,
+                service_down_action=None,
+                slow_ramp_time=None
             ))
         self.assertEqual(listener.id, '8334f461-0df0-42d5-97eb-f4678eb26bea')
         self.assertEqual(listener.name, 'test')
@@ -305,6 +317,27 @@ def test_ex_get_nodes(self):
         self.assertEqual(nodes[0].id, '34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
         self.assertEqual(nodes[0].ip, '10.10.10.101')
 
+    def test_ex_get_node(self):
+        node = self.driver.ex_get_node('34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
+        self.assertEqual(node.name, 'ProductionNode.2')
+        self.assertEqual(node.id, '34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
+        self.assertEqual(node.ip, '10.10.10.101')
+
+    def test_ex_update_node(self):
+        node = self.driver.ex_get_node('34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
+        node.connection_limit = '100'
+        result = self.driver.ex_update_node(node)
+        self.assertEqual(result.connection_limit, '100')
+
+    def test_ex_destroy_node(self):
+        result = self.driver.ex_destroy_node('34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
+        self.assertTrue(result)
+
+    def test_ex_set_node_state(self):
+        node = self.driver.ex_get_node('34de6ed6-46a4-4dae-a753-2f8d3840c6f9')
+        result = self.driver.ex_set_node_state(node, False)
+        self.assertEqual(result.connection_limit, '10000')
+
     def test_ex_get_pools(self):
         pools = self.driver.ex_get_pools()
         self.assertNotEqual(0, len(pools))
@@ -316,13 +349,23 @@ def test_ex_get_pool(self):
         self.assertEqual(pool.name, 'myDevelopmentPool.1')
         self.assertEqual(pool.id, '4d360b1f-bc2c-4ab7-9884-1f03ba2768f7')
 
+    def test_ex_update_pool(self):
+        pool = self.driver.ex_get_pool('4d360b1f-bc2c-4ab7-9884-1f03ba2768f7')
+        pool.slow_ramp_time = '120'
+        result = self.driver.ex_update_pool(pool)
+        self.assertTrue(result)
+
     def test_ex_destroy_pool(self):
         response = self.driver.ex_destroy_pool(
             pool=DimensionDataPool(
                 id='4d360b1f-bc2c-4ab7-9884-1f03ba2768f7',
                 name='test',
                 description='test',
-                status=State.RUNNING))
+                status=State.RUNNING,
+                health_monitor_id=None,
+                load_balance_method=None,
+                service_down_action=None,
+                slow_ramp_time=None))
         self.assertTrue(response)
 
     def test_get_pool_members(self):
@@ -343,6 +386,11 @@ def test_get_pool_member(self):
         self.assertEqual(member.ip, '10.0.3.13')
         self.assertEqual(member.port, 9889)
 
+    def test_set_pool_member_state(self):
+        member = self.driver.ex_get_pool_member('3dd806a2-c2c8-4c0c-9a4f-5219ea9266c0')
+        result = self.driver.ex_set_pool_member_state(member, True)
+        self.assertTrue(result)
+
     def test_ex_destroy_pool_member(self):
         response = self.driver.ex_destroy_pool_member(
             member=DimensionDataPoolMember(
@@ -458,6 +506,25 @@ def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node(self, m
             'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node.xml')
         return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_node_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editNode.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPool.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
+
+    def _caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember(self, method, url, body, headers):
+        body = self.fixtures.load(
+            'caas_2_0_8a8f6abc_2745_4d8a_9cbc_8dabe5a7d0e4_networkDomainVip_editPoolMember.xml')
+        return (httplib.OK, body, {}, httplib.responses[httplib.OK])
 
 if __name__ == '__main__':
     sys.exit(unittest.main())