@@ -23,14 +23,11 @@ class TestFlavorProfile(network_fakes.TestNetworkV2):
2323 def setUp (self ):
2424 super ().setUp ()
2525
26- # Get the ProjectManager Mock
27- self .projects_mock = self .identity_client .projects
2826 # Get the DomainManager Mock
2927 self .domains_mock = self .identity_client .domains
3028
3129
3230class TestCreateFlavorProfile (TestFlavorProfile ):
33- project = identity_fakes_v3 .FakeProject .create_one_project ()
3431 domain = identity_fakes_v3 .FakeDomain .create_one_domain ()
3532 new_flavor_profile = network_fakes .create_one_service_profile ()
3633
@@ -40,7 +37,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
4037 'enabled' ,
4138 'id' ,
4239 'meta_info' ,
43- 'project_id' ,
4440 )
4541
4642 data = (
@@ -49,15 +45,13 @@ class TestCreateFlavorProfile(TestFlavorProfile):
4945 new_flavor_profile .is_enabled ,
5046 new_flavor_profile .id ,
5147 new_flavor_profile .meta_info ,
52- new_flavor_profile .project_id ,
5348 )
5449
5550 def setUp (self ):
5651 super ().setUp ()
5752 self .network_client .create_service_profile = mock .Mock (
5853 return_value = self .new_flavor_profile
5954 )
60- self .projects_mock .get .return_value = self .project
6155 # Get the command object to test
6256 self .cmd = network_flavor_profile .CreateNetworkFlavorProfile (
6357 self .app , None
@@ -67,10 +61,6 @@ def test_create_all_options(self):
6761 arglist = [
6862 "--description" ,
6963 self .new_flavor_profile .description ,
70- "--project" ,
71- self .new_flavor_profile .project_id ,
72- '--project-domain' ,
73- self .domain .name ,
7464 "--enable" ,
7565 "--driver" ,
7666 self .new_flavor_profile .driver ,
@@ -80,8 +70,6 @@ def test_create_all_options(self):
8070
8171 verifylist = [
8272 ('description' , self .new_flavor_profile .description ),
83- ('project' , self .new_flavor_profile .project_id ),
84- ('project_domain' , self .domain .name ),
8573 ('enable' , True ),
8674 ('driver' , self .new_flavor_profile .driver ),
8775 ('metainfo' , self .new_flavor_profile .meta_info ),
@@ -93,7 +81,6 @@ def test_create_all_options(self):
9381 self .network_client .create_service_profile .assert_called_once_with (
9482 ** {
9583 'description' : self .new_flavor_profile .description ,
96- 'project_id' : self .project .id ,
9784 'enabled' : self .new_flavor_profile .is_enabled ,
9885 'driver' : self .new_flavor_profile .driver ,
9986 'metainfo' : self .new_flavor_profile .meta_info ,
@@ -106,19 +93,13 @@ def test_create_with_metainfo(self):
10693 arglist = [
10794 "--description" ,
10895 self .new_flavor_profile .description ,
109- "--project" ,
110- self .new_flavor_profile .project_id ,
111- '--project-domain' ,
112- self .domain .name ,
11396 "--enable" ,
11497 "--metainfo" ,
11598 self .new_flavor_profile .meta_info ,
11699 ]
117100
118101 verifylist = [
119102 ('description' , self .new_flavor_profile .description ),
120- ('project' , self .new_flavor_profile .project_id ),
121- ('project_domain' , self .domain .name ),
122103 ('enable' , True ),
123104 ('metainfo' , self .new_flavor_profile .meta_info ),
124105 ]
@@ -129,7 +110,6 @@ def test_create_with_metainfo(self):
129110 self .network_client .create_service_profile .assert_called_once_with (
130111 ** {
131112 'description' : self .new_flavor_profile .description ,
132- 'project_id' : self .project .id ,
133113 'enabled' : self .new_flavor_profile .is_enabled ,
134114 'metainfo' : self .new_flavor_profile .meta_info ,
135115 }
@@ -141,19 +121,13 @@ def test_create_with_driver(self):
141121 arglist = [
142122 "--description" ,
143123 self .new_flavor_profile .description ,
144- "--project" ,
145- self .new_flavor_profile .project_id ,
146- '--project-domain' ,
147- self .domain .name ,
148124 "--enable" ,
149125 "--driver" ,
150126 self .new_flavor_profile .driver ,
151127 ]
152128
153129 verifylist = [
154130 ('description' , self .new_flavor_profile .description ),
155- ('project' , self .new_flavor_profile .project_id ),
156- ('project_domain' , self .domain .name ),
157131 ('enable' , True ),
158132 ('driver' , self .new_flavor_profile .driver ),
159133 ]
@@ -164,7 +138,6 @@ def test_create_with_driver(self):
164138 self .network_client .create_service_profile .assert_called_once_with (
165139 ** {
166140 'description' : self .new_flavor_profile .description ,
167- 'project_id' : self .project .id ,
168141 'enabled' : self .new_flavor_profile .is_enabled ,
169142 'driver' : self .new_flavor_profile .driver ,
170143 }
@@ -176,17 +149,11 @@ def test_create_without_driver_and_metainfo(self):
176149 arglist = [
177150 "--description" ,
178151 self .new_flavor_profile .description ,
179- "--project" ,
180- self .new_flavor_profile .project_id ,
181- '--project-domain' ,
182- self .domain .name ,
183152 "--enable" ,
184153 ]
185154
186155 verifylist = [
187156 ('description' , self .new_flavor_profile .description ),
188- ('project' , self .new_flavor_profile .project_id ),
189- ('project_domain' , self .domain .name ),
190157 ('enable' , True ),
191158 ]
192159
@@ -377,15 +344,13 @@ class TestShowFlavorProfile(TestFlavorProfile):
377344 'enabled' ,
378345 'id' ,
379346 'meta_info' ,
380- 'project_id' ,
381347 )
382348 data = (
383349 network_flavor_profile .description ,
384350 network_flavor_profile .driver ,
385351 network_flavor_profile .is_enabled ,
386352 network_flavor_profile .id ,
387353 network_flavor_profile .meta_info ,
388- network_flavor_profile .project_id ,
389354 )
390355
391356 def setUp (self ):
0 commit comments