Skip to content

Commit db115c0

Browse files
committed
remove project from network flavor profile
Removing project from network_flavor_profile as neutron api does not uses project. Closes-Bug: 2046496 Change-Id: I77b0544cf8629fb0a5b9914361a007d28b2b5662
1 parent 7c6b47b commit db115c0

2 files changed

Lines changed: 1 addition & 52 deletions

File tree

openstackclient/network/v2/network_flavor_profile.py

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from osc_lib import utils
1919

2020
from openstackclient.i18n import _
21-
from openstackclient.identity import common as identity_common
2221
from openstackclient.network import common
2322

2423
LOG = logging.getLogger(__name__)
@@ -29,7 +28,7 @@ def _get_columns(item):
2928
'is_enabled': 'enabled',
3029
}
3130

32-
hidden_columns = ['location', 'name', 'tenant_id']
31+
hidden_columns = ['location', 'name', 'tenant_id', 'project_id']
3332
return utils.get_osc_show_columns_for_sdk_resource(
3433
item, column_map, hidden_columns
3534
)
@@ -47,14 +46,6 @@ def _get_attrs(client_manager, parsed_args):
4746
attrs['enabled'] = True
4847
if parsed_args.disable:
4948
attrs['enabled'] = False
50-
if 'project' in parsed_args and parsed_args.project is not None:
51-
identity_client = client_manager.identity
52-
project_id = identity_common.find_project(
53-
identity_client,
54-
parsed_args.project,
55-
parsed_args.project_domain,
56-
).id
57-
attrs['project_id'] = project_id
5849

5950
return attrs
6051

@@ -68,12 +59,6 @@ class CreateNetworkFlavorProfile(
6859

6960
def get_parser(self, prog_name):
7061
parser = super().get_parser(prog_name)
71-
parser.add_argument(
72-
'--project',
73-
metavar="<project>",
74-
help=_("Owner's project (name or ID)"),
75-
)
76-
identity_common.add_project_domain_option_to_parser(parser)
7762
parser.add_argument(
7863
'--description',
7964
metavar="<description>",
@@ -212,7 +197,6 @@ def get_parser(self, prog_name):
212197
metavar="<flavor-profile>",
213198
help=_("Flavor profile to update (ID only)"),
214199
)
215-
identity_common.add_project_domain_option_to_parser(parser)
216200
parser.add_argument(
217201
'--description',
218202
metavar="<description>",

openstackclient/tests/unit/network/v2/test_network_flavor_profile.py

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -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

3230
class 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

Comments
 (0)