From 8f8a8448a4adc1d250c253738688ff46e6456616 Mon Sep 17 00:00:00 2001
From: Reedip <reedip.banerjee@nectechnologies.in>
Date: Tue, 4 Oct 2016 16:25:07 +0530
Subject: [PATCH] Add necessary info to Floating IP list

This patch adds the Network ID and Project ID
for the listed floating IPs when Neutron is enabled
for OpenstackClient.

Change-Id: I823090f2e6d30acd72247d30956f48f4d7672a50
Closes-Bug:#1566090
---
 openstackclient/network/v2/floating_ip.py                 | 4 ++++
 openstackclient/tests/unit/network/v2/test_floating_ip.py | 4 ++++
 releasenotes/notes/bug-1566090_64726dc7df5b1572.yaml      | 7 +++++++
 3 files changed, 15 insertions(+)
 create mode 100644 releasenotes/notes/bug-1566090_64726dc7df5b1572.yaml

diff --git a/openstackclient/network/v2/floating_ip.py b/openstackclient/network/v2/floating_ip.py
index bb75540cc6..e805762849 100644
--- a/openstackclient/network/v2/floating_ip.py
+++ b/openstackclient/network/v2/floating_ip.py
@@ -203,12 +203,16 @@ class ListFloatingIP(common.NetworkAndComputeLister):
             'floating_ip_address',
             'fixed_ip_address',
             'port_id',
+            'floating_network_id',
+            'project_id',
         )
         headers = (
             'ID',
             'Floating IP Address',
             'Fixed IP Address',
             'Port',
+            'Floating Network',
+            'Project',
         )
 
         query = {}
diff --git a/openstackclient/tests/unit/network/v2/test_floating_ip.py b/openstackclient/tests/unit/network/v2/test_floating_ip.py
index 1f30f2e923..578c615432 100644
--- a/openstackclient/tests/unit/network/v2/test_floating_ip.py
+++ b/openstackclient/tests/unit/network/v2/test_floating_ip.py
@@ -237,6 +237,8 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
         'Floating IP Address',
         'Fixed IP Address',
         'Port',
+        'Floating Network',
+        'Project',
     )
 
     data = []
@@ -246,6 +248,8 @@ class TestListFloatingIPNetwork(TestFloatingIPNetwork):
             ip.floating_ip_address,
             ip.fixed_ip_address,
             ip.port_id,
+            ip.floating_network_id,
+            ip.tenant_id,
         ))
 
     def setUp(self):
diff --git a/releasenotes/notes/bug-1566090_64726dc7df5b1572.yaml b/releasenotes/notes/bug-1566090_64726dc7df5b1572.yaml
new file mode 100644
index 0000000000..464e57f032
--- /dev/null
+++ b/releasenotes/notes/bug-1566090_64726dc7df5b1572.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    ``openstack floating ip`` now provides ``Floating Network`` and
+    ``Project`` to identify to which network and project the
+    floating-ip belongs to.
+    [Bug `1566090 <https://bugs.launchpad.net/bugs/1566090>`_]