From eb294a5b69f4e3a14d34a4f13c44461ed2ef6981 Mon Sep 17 00:00:00 2001
From: Matt Dietz <matt.dietz@rackspace.com>
Date: Wed, 25 Jan 2012 20:08:34 +0000
Subject: [PATCH] Adds network_id to the ip_blocks view

Change-Id: I1ff225af98cc10624e5ff2866f1cad98c412a4f7
---
 melange/ipam/views.py                 | 1 +
 melange/tests/unit/test_ipam_views.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/melange/ipam/views.py b/melange/ipam/views.py
index bca2cdad..c8a6846f 100644
--- a/melange/ipam/views.py
+++ b/melange/ipam/views.py
@@ -49,6 +49,7 @@ class IpConfigurationView(object):
             'cidr': block.cidr,
             'broadcast': block.broadcast,
             'gateway': block.gateway,
+            'network_id': block.network_id,
             'netmask': block.netmask,
             'dns1': block.dns1,
             'dns2': block.dns2,
diff --git a/melange/tests/unit/test_ipam_views.py b/melange/tests/unit/test_ipam_views.py
index be80e7d1..4318d12a 100644
--- a/melange/tests/unit/test_ipam_views.py
+++ b/melange/tests/unit/test_ipam_views.py
@@ -75,6 +75,7 @@ def _ip_data(ip, block):
         'ip_block': {
             'id': block.id,
             'cidr': block.cidr,
+            'network_id': block.network_id,
             'broadcast': block.broadcast,
             'gateway': block.gateway,
             'netmask': block.netmask,