@@ -64,28 +64,9 @@ class TestServer(compute_fakes.TestComputev2):
6464 def setUp (self ):
6565 super ().setUp ()
6666
67- # Get a shortcut to the compute client ServerMigrationsManager Mock
68- self .server_migrations_mock = self .compute_client .server_migrations
69- self .server_migrations_mock .reset_mock ()
70-
71- # Get a shortcut to the compute client VolumeManager mock
72- self .servers_volumes_mock = self .compute_client .volumes
73- self .servers_volumes_mock .reset_mock ()
74-
75- # Get a shortcut to the compute client MigrationManager mock
76- self .migrations_mock = self .compute_client .migrations
77- self .migrations_mock .reset_mock ()
78-
79- # Get a shortcut to the compute client FlavorManager Mock
80- self .flavors_mock = self .compute_client .flavors
81- self .flavors_mock .reset_mock ()
82-
8367 # Set object attributes to be tested. Could be overwritten in subclass.
8468 self .attrs = {}
8569
86- # Set object methods to be tested. Could be overwritten in subclass.
87- self .methods = {}
88-
8970 def setup_sdk_servers_mock (self , count ):
9071 servers = compute_fakes .create_sdk_servers (
9172 attrs = self .attrs ,
@@ -662,11 +643,6 @@ def setUp(self):
662643 # Get the command object to test
663644 self .cmd = server .AddPort (self .app , None )
664645
665- # Set add_fixed_ip method to be tested.
666- self .methods = {
667- 'interface_attach' : None ,
668- }
669-
670646 self .find_port = mock .Mock ()
671647 self .app .client_manager .network .find_port = self .find_port
672648
@@ -754,10 +730,6 @@ class TestServerVolume(TestServer):
754730 def setUp (self ):
755731 super ().setUp ()
756732
757- self .methods = {
758- 'create_volume_attachment' : None ,
759- }
760-
761733 self .servers = self .setup_sdk_servers_mock (count = 1 )
762734 self .volumes = self .setup_sdk_volumes_mock (count = 1 )
763735
@@ -1092,11 +1064,6 @@ def setUp(self):
10921064 # Get the command object to test
10931065 self .cmd = server .AddNetwork (self .app , None )
10941066
1095- # Set add_fixed_ip method to be tested.
1096- self .methods = {
1097- 'interface_attach' : None ,
1098- }
1099-
11001067 self .find_network = mock .Mock ()
11011068 self .app .client_manager .network .find_network = self .find_network
11021069
@@ -7342,11 +7309,6 @@ def setUp(self):
73427309 # Get the command object to test
73437310 self .cmd = server .RemovePort (self .app , None )
73447311
7345- # Set method to be tested.
7346- self .methods = {
7347- 'delete_server_interface' : None ,
7348- }
7349-
73507312 self .find_port = mock .Mock ()
73517313 self .app .client_manager .network .find_port = self .find_port
73527314
@@ -7392,10 +7354,6 @@ def setUp(self):
73927354
73937355 # Set method to be tested.
73947356 self .fake_inf = mock .Mock ()
7395- self .methods = {
7396- 'server_interfaces' : [self .fake_inf ],
7397- 'delete_server_interface' : None ,
7398- }
73997357
74007358 self .find_network = mock .Mock ()
74017359 self .app .client_manager .network .find_network = self .find_network
0 commit comments