From 16290908eaca73caa6b3f2ce36fb8add0b7d3615 Mon Sep 17 00:00:00 2001
From: Dan Wendlandt <dan@nicira.com>
Date: Thu, 25 Aug 2011 22:45:24 -0700
Subject: fix for quantum api changes, change nova-mange to have quantum_list
 command

---
 bin/nova-manage                            | 23 +++++++++++++++++------
 nova/network/quantum/client.py             |  2 +-
 nova/network/quantum/quantum_connection.py |  4 ++--
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/bin/nova-manage b/bin/nova-manage
index 9819ef206..4628e93b2 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -773,7 +773,7 @@ class NetworkCommands(object):
     def list(self):
         """List all created networks"""
         _fmt = "%-5s\t%-18s\t%-15s\t%-15s\t%-15s\t%-15s\t%-15s"\
-                "\t%-15s\t%-15s\t-15s\t-15s"
+                "\t%-15s\t%-15s"
         print _fmt % (_('id'),
                           _('IPv4'),
                           _('IPv6'),
@@ -782,9 +782,7 @@ class NetworkCommands(object):
                           _('DNS2'),
                           _('VlanID'),
                           _('project'),
-                          _("uuid"),
-                          _('priority'),
-                          _('bridge'))
+                          _("uuid"))
         for network in db.network_get_all(context.get_admin_context()):
             print _fmt % (network.id,
                           network.cidr,
@@ -794,9 +792,22 @@ class NetworkCommands(object):
                           network.dns2,
                           network.vlan,
                           network.project_id,
-                          network.uuid,
+                          network.uuid)
+
+    def quantum_list(self):
+        """List all created networks with Quantum-relevant fields"""
+        _fmt = "%-32s\t%-10s\t%-10s\t%s , %s"
+        print _fmt % ( _('bridge / quantum-id'),
+                       _('project'),
+                       _('priority'),
+                       _('cidr_v4'),
+                       _('cidr_v6'))
+        for network in db.network_get_all(context.get_admin_context()):
+            print _fmt % (network.bridge,
+                          network.project_id,
                           network.priority,
-                          network.bridge)
+                          network.cidr,
+                          network.cidr_v6)
 
     @args('--network', dest="fixed_range", metavar='<x.x.x.x/yy>',
             help='Network to delete')
diff --git a/nova/network/quantum/client.py b/nova/network/quantum/client.py
index a0c7dc6d8..b57294c55 100644
--- a/nova/network/quantum/client.py
+++ b/nova/network/quantum/client.py
@@ -63,7 +63,7 @@ class Client(object):
 
     """A base client class - derived from Glance.BaseClient"""
 
-    action_prefix = '/v0.1/tenants/{tenant_id}'
+    action_prefix = '/v1.0/tenants/{tenant_id}'
 
     """Action query strings"""
     networks_path = "/networks"
diff --git a/nova/network/quantum/quantum_connection.py b/nova/network/quantum/quantum_connection.py
index 3aa017bcd..d6f749bf2 100644
--- a/nova/network/quantum/quantum_connection.py
+++ b/nova/network/quantum/quantum_connection.py
@@ -46,9 +46,9 @@ class QuantumClientConnection:
                              logger=LOG)
 
     def create_network(self, tenant_id, network_name):
-        data = {'network': {'net-name': network_name}}
+        data = {'network': {'name': network_name}}
         resdict = self.client.create_network(data, tenant=tenant_id)
-        return resdict["networks"]["network"]["id"]
+        return resdict["network"]["id"]
 
     def delete_network(self, tenant_id, net_id):
         self.client.delete_network(net_id, tenant=tenant_id)
-- 
cgit