From 1e9eaef8621e5eb3dedda2252961aa20b5b0ad6b Mon Sep 17 00:00:00 2001
From: Nastya Urlapova <aurlapova@mirantis.com>
Date: Mon, 23 Mar 2015 21:16:20 +0000
Subject: [PATCH] Revert "Add output of full subnet from slave node"

This reverts commit 585f9af050c422f5b60391d2b88bfb5c1f7b2aec.

Change-Id: If04ada200b5ceff13bfa96cf5a574cae0e43c41f
Related-bug: #1435560
---
 fuelweb_test/helpers/os_actions.py     |  7 -------
 fuelweb_test/models/fuel_web_client.py | 17 +++++++----------
 fuelweb_test/tests/test_neutron.py     |  1 +
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/fuelweb_test/helpers/os_actions.py b/fuelweb_test/helpers/os_actions.py
index 27dd59715..44bda46c9 100644
--- a/fuelweb_test/helpers/os_actions.py
+++ b/fuelweb_test/helpers/os_actions.py
@@ -273,13 +273,6 @@ class OpenStackActions(common.Common):
                 return net
         return None
 
-    def get_subnet(self, subnet_name):
-        subnet_list = self.neutron.list_subnets()
-        for subnet in subnet_list['subnets']:
-            if subnet['name'] == subnet_name:
-                return subnet
-        return None
-
     def get_router(self, network):
         router_list = self.neutron.list_routers()
         for router in router_list['routers']:
diff --git a/fuelweb_test/models/fuel_web_client.py b/fuelweb_test/models/fuel_web_client.py
index 9c644c28d..663ece20e 100644
--- a/fuelweb_test/models/fuel_web_client.py
+++ b/fuelweb_test/models/fuel_web_client.py
@@ -26,7 +26,6 @@ from proboscis.asserts import assert_equal
 from proboscis.asserts import assert_true
 
 from fuelweb_test.helpers import checkers
-from fuelweb_test.helpers import os_actions
 from fuelweb_test import logwrap
 from fuelweb_test import logger
 from fuelweb_test.helpers.decorators import custom_repo
@@ -1363,17 +1362,15 @@ class FuelWebClient(object):
                          'Cidr after deployment is not equal'
                          ' to cidr by default')
         elif net_provider == 'neutron':
-            os = os_actions.OpenStackActions(
-                self.get_public_vip(cluster_id))
             nailgun_cidr = self.get_nailgun_cidr_neutron(cluster_id)
             logger.debug('nailgun cidr is {0}'.format(nailgun_cidr))
-            subnet = os.get_subnet('net04__subnet')
-            logger.debug('net04__subnet: {0}'.format(
-                subnet))
-            assert_true(subnet, "net04__subnet does not exists")
-            logger.debug('cidr net04__subnet: {0}'.format(
-                subnet['cidr']))
-            assert_equal(nailgun_cidr, subnet['cidr'].rstrip(),
+            slave_cidr = ''.join(remote.execute(". openrc; neutron"
+                                                " subnet-list | awk '$4 =="
+                                                " \"net04__subnet\""
+                                                "{print $6}'")['stdout'])
+            logger.debug('slave cidr is {0}'.format(
+                slave_cidr.rstrip()))
+            assert_equal(nailgun_cidr, slave_cidr.rstrip(),
                          'Cidr after deployment is not equal'
                          ' to cidr by default')
 
diff --git a/fuelweb_test/tests/test_neutron.py b/fuelweb_test/tests/test_neutron.py
index 88827cc00..da0493b5f 100644
--- a/fuelweb_test/tests/test_neutron.py
+++ b/fuelweb_test/tests/test_neutron.py
@@ -322,6 +322,7 @@ class NeutronVlanHa(TestBasic):
         _ip = self.fuel_web.get_nailgun_node_by_name('slave-01')['ip']
         self.fuel_web.check_fixed_network_cidr(
             cluster_id, self.env.d_env.get_ssh_to_remote(_ip))
+
         self.fuel_web.verify_network(cluster_id)
         devops_node = self.fuel_web.get_nailgun_primary_controller(
             self.env.d_env.nodes().slaves[0])