From: armando-migliaccio <armamig@gmail.com>
Date: Fri, 28 Aug 2015 23:01:31 +0000 (-0700)
Subject: Fix misnomer on network attribute
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=4251f7dfa968c41c8eb3df90d16a80b67b7b43d0;p=openstack-build%2Fneutron-build.git

Fix misnomer on network attribute

admin_status_up is not a network attribute; admin_state_up is.

Change-Id: Iccdfb3d32ee59f5c475bb72801814ae5aaa2fc0c
---

diff --git a/neutron/tests/unit/db/test_db_base_plugin_v2.py b/neutron/tests/unit/db/test_db_base_plugin_v2.py
index bb505acb4..698931bd1 100644
--- a/neutron/tests/unit/db/test_db_base_plugin_v2.py
+++ b/neutron/tests/unit/db/test_db_base_plugin_v2.py
@@ -2504,9 +2504,9 @@ class TestNetworksV2(NeutronDbPluginV2TestCase):
     def test_list_networks_with_sort_native(self):
         if self._skip_native_sorting:
             self.skipTest("Skip test for not implemented sorting feature")
-        with self.network(admin_status_up=True, name='net1') as net1,\
-                self.network(admin_status_up=False, name='net2') as net2,\
-                self.network(admin_status_up=False, name='net3') as net3:
+        with self.network(admin_state_up=True, name='net1') as net1,\
+                self.network(admin_state_up=False, name='net2') as net2,\
+                self.network(admin_state_up=False, name='net3') as net3:
             self._test_list_with_sort('network', (net3, net2, net1),
                                       [('admin_state_up', 'asc'),
                                        ('name', 'desc')])
@@ -2514,9 +2514,9 @@ class TestNetworksV2(NeutronDbPluginV2TestCase):
     def test_list_networks_with_sort_extended_attr_native_returns_400(self):
         if self._skip_native_sorting:
             self.skipTest("Skip test for not implemented sorting feature")
-        with self.network(admin_status_up=True, name='net1'),\
-                self.network(admin_status_up=False, name='net2'),\
-                self.network(admin_status_up=False, name='net3'):
+        with self.network(admin_state_up=True, name='net1'),\
+                self.network(admin_state_up=False, name='net2'),\
+                self.network(admin_state_up=False, name='net3'):
             req = self.new_list_request(
                 'networks',
                 params='sort_key=provider:segmentation_id&sort_dir=asc')
@@ -2526,9 +2526,9 @@ class TestNetworksV2(NeutronDbPluginV2TestCase):
     def test_list_networks_with_sort_remote_key_native_returns_400(self):
         if self._skip_native_sorting:
             self.skipTest("Skip test for not implemented sorting feature")
-        with self.network(admin_status_up=True, name='net1'),\
-                self.network(admin_status_up=False, name='net2'),\
-                self.network(admin_status_up=False, name='net3'):
+        with self.network(admin_state_up=True, name='net1'),\
+                self.network(admin_state_up=False, name='net2'),\
+                self.network(admin_state_up=False, name='net3'):
             req = self.new_list_request(
                 'networks', params='sort_key=subnets&sort_dir=asc')
             res = req.get_response(self.api)
@@ -2539,9 +2539,9 @@ class TestNetworksV2(NeutronDbPluginV2TestCase):
             'neutron.api.v2.base.Controller._get_sorting_helper',
             new=_fake_get_sorting_helper)
         helper_patcher.start()
-        with self.network(admin_status_up=True, name='net1') as net1,\
-                self.network(admin_status_up=False, name='net2') as net2,\
-                self.network(admin_status_up=False, name='net3') as net3:
+        with self.network(admin_state_up=True, name='net1') as net1,\
+                self.network(admin_state_up=False, name='net2') as net2,\
+                self.network(admin_state_up=False, name='net3') as net3:
             self._test_list_with_sort('network', (net3, net2, net1),
                                       [('admin_state_up', 'asc'),
                                        ('name', 'desc')])