From d87b37876abdb89b89b40aeefba0fcae86efde41 Mon Sep 17 00:00:00 2001
From: Henry Gessau <gessau@gmail.com>
Date: Mon, 18 Apr 2016 14:05:42 -0400
Subject: [PATCH] Move class properties to instances for dhcp/test_agent.py

Using class properties for tests always carries the risk of
conflicting use between test cases when tests are run in parallel.

Change-Id: I41034001a8674ad208c57f2f60266769390f924b
Related-Bug: #1569507
---
 neutron/tests/unit/agent/dhcp/test_agent.py | 56 ++++++++++++---------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/neutron/tests/unit/agent/dhcp/test_agent.py b/neutron/tests/unit/agent/dhcp/test_agent.py
index f7320ae0a2f..2ece8d1e88d 100644
--- a/neutron/tests/unit/agent/dhcp/test_agent.py
+++ b/neutron/tests/unit/agent/dhcp/test_agent.py
@@ -1181,50 +1181,60 @@ class TestNetworkCache(base.BaseTestCase):
 
 
 class FakePort1(object):
-    id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
+    def __init__(self):
+        self.id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
 
 
 class FakeV4Subnet(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
+    def __init__(self):
+        self.id = 'dddddddd-dddd-dddd-dddd-dddddddddddd'
+        self.ip_version = 4
+        self.cidr = '192.168.0.0/24'
+        self.gateway_ip = '192.168.0.1'
+        self.enable_dhcp = True
 
 
 class FakeV4SubnetOutsideGateway(FakeV4Subnet):
-    gateway_ip = '192.168.1.1'
+    def __init__(self):
+        super(FakeV4SubnetOutsideGateway, self).__init__()
+        self.gateway_ip = '192.168.1.1'
 
 
 class FakeV4SubnetNoGateway(object):
-    id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
-    ip_version = 4
-    cidr = '192.168.1.0/24'
-    gateway_ip = None
-    enable_dhcp = True
+    def __init__(self):
+        self.id = 'eeeeeeee-eeee-eeee-eeee-eeeeeeeeeeee'
+        self.ip_version = 4
+        self.cidr = '192.168.1.0/24'
+        self.gateway_ip = None
+        self.enable_dhcp = True
 
 
 class FakeV4Network(object):
-    id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
-    subnets = [FakeV4Subnet()]
-    ports = [FakePort1()]
-    namespace = 'qdhcp-aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+    def __init__(self):
+        self.id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+        self.subnets = [FakeV4Subnet()]
+        self.ports = [FakePort1()]
+        self.namespace = 'qdhcp-aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
 
 
 class FakeV4NetworkOutsideGateway(FakeV4Network):
-    subnets = [FakeV4SubnetOutsideGateway()]
+    def __init__(self):
+        super(FakeV4NetworkOutsideGateway, self).__init__()
+        self.subnets = [FakeV4SubnetOutsideGateway()]
 
 
 class FakeV4NetworkNoSubnet(object):
-    id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
-    subnets = []
-    ports = []
+    def __init__(self):
+        self.id = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa'
+        self.subnets = []
+        self.ports = []
 
 
 class FakeV4NetworkNoGateway(object):
-    id = 'cccccccc-cccc-cccc-cccc-cccccccccccc'
-    subnets = [FakeV4SubnetNoGateway()]
-    ports = [FakePort1()]
+    def __init__(self):
+        self.id = 'cccccccc-cccc-cccc-cccc-cccccccccccc'
+        self.subnets = [FakeV4SubnetNoGateway()]
+        self.ports = [FakePort1()]
 
 
 class TestDeviceManager(base.BaseTestCase):