From: huangpengtao <huangpengtao@huawei.com>
Date: Tue, 4 Aug 2015 03:33:38 +0000 (+0800)
Subject: "FakeV4Subnet" class be inherited by following class
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=df54b0a38c28ea6034b22dcb43491bfd8b84630c;p=openstack-build%2Fneutron-build.git

"FakeV4Subnet" class be inherited by following class

"FakeV4Subnet" class can be inherited by following
class,whick will be better to code

Change-Id: Ib76a93da1081812e3ed595c41f5f6c72bdbb6547
---

diff --git a/neutron/tests/unit/agent/linux/test_dhcp.py b/neutron/tests/unit/agent/linux/test_dhcp.py
index 61f4ea66e..991ac37d8 100644
--- a/neutron/tests/unit/agent/linux/test_dhcp.py
+++ b/neutron/tests/unit/agent/linux/test_dhcp.py
@@ -293,52 +293,29 @@ class FakeV4Subnet(object):
     dns_nameservers = ['8.8.8.8']
 
 
-class FakeV4Subnet2(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
+class FakeV4Subnet2(FakeV4Subnet):
     cidr = '192.168.1.0/24'
     gateway_ip = '192.168.1.1'
-    enable_dhcp = True
     host_routes = []
-    dns_nameservers = ['8.8.8.8']
 
 
-class FakeV4MetadataSubnet(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
+class FakeV4MetadataSubnet(FakeV4Subnet):
     cidr = '169.254.169.254/30'
     gateway_ip = '169.254.169.253'
-    enable_dhcp = True
     host_routes = []
     dns_nameservers = []
 
 
-class FakeV4SubnetGatewayRoute(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
-    cidr = '192.168.0.0/24'
-    gateway_ip = '192.168.0.1'
-    enable_dhcp = True
+class FakeV4SubnetGatewayRoute(FakeV4Subnet):
     host_routes = [FakeV4HostRouteGateway]
-    dns_nameservers = ['8.8.8.8']
 
 
-class FakeV4SubnetMultipleAgentsWithoutDnsProvided(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
-    cidr = '192.168.0.0/24'
-    gateway_ip = '192.168.0.1'
-    enable_dhcp = True
+class FakeV4SubnetMultipleAgentsWithoutDnsProvided(FakeV4Subnet):
     dns_nameservers = []
     host_routes = []
 
 
-class FakeV4SubnetAgentWithManyDnsProvided(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
-    cidr = '192.168.0.0/24'
-    gateway_ip = '192.168.0.1'
-    enable_dhcp = True
+class FakeV4SubnetAgentWithManyDnsProvided(FakeV4Subnet):
     dns_nameservers = ['2.2.2.2', '9.9.9.9', '1.1.1.1',
                        '3.3.3.3']
     host_routes = []
@@ -360,13 +337,7 @@ class FakeV4AgentWithManyDnsProvided(object):
     namespace = 'qdhcp-ns'
 
 
-class FakeV4SubnetMultipleAgentsWithDnsProvided(object):
-    id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
-    ip_version = 4
-    cidr = '192.168.0.0/24'
-    gateway_ip = '192.168.0.1'
-    enable_dhcp = True
-    dns_nameservers = ['8.8.8.8']
+class FakeV4SubnetMultipleAgentsWithDnsProvided(FakeV4Subnet):
     host_routes = []
 
 
@@ -435,9 +406,8 @@ class FakeV6SubnetStateless(object):
     ipv6_ra_mode = None
 
 
-class FakeV4SubnetNoGateway(object):
+class FakeV4SubnetNoGateway(FakeV4Subnet):
     id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
-    ip_version = 4
     cidr = '192.168.1.0/24'
     gateway_ip = None
     enable_dhcp = True
@@ -445,12 +415,10 @@ class FakeV4SubnetNoGateway(object):
     dns_nameservers = []
 
 
-class FakeV4SubnetNoRouter(object):
+class FakeV4SubnetNoRouter(FakeV4Subnet):
     id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
-    ip_version = 4
     cidr = '192.168.1.0/24'
     gateway_ip = '192.168.1.1'
-    enable_dhcp = True
     host_routes = []
     dns_nameservers = []