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
This commit is contained in:
@@ -18,7 +18,6 @@ from osc_lib import exceptions
|
|||||||
from osc_lib import utils
|
from osc_lib import utils
|
||||||
|
|
||||||
from openstackclient.i18n import _
|
from openstackclient.i18n import _
|
||||||
from openstackclient.identity import common as identity_common
|
|
||||||
from openstackclient.network import common
|
from openstackclient.network import common
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
@@ -29,7 +28,7 @@ def _get_columns(item):
|
|||||||
'is_enabled': 'enabled',
|
'is_enabled': 'enabled',
|
||||||
}
|
}
|
||||||
|
|
||||||
hidden_columns = ['location', 'name', 'tenant_id']
|
hidden_columns = ['location', 'name', 'tenant_id', 'project_id']
|
||||||
return utils.get_osc_show_columns_for_sdk_resource(
|
return utils.get_osc_show_columns_for_sdk_resource(
|
||||||
item, column_map, hidden_columns
|
item, column_map, hidden_columns
|
||||||
)
|
)
|
||||||
@@ -47,14 +46,6 @@ def _get_attrs(client_manager, parsed_args):
|
|||||||
attrs['enabled'] = True
|
attrs['enabled'] = True
|
||||||
if parsed_args.disable:
|
if parsed_args.disable:
|
||||||
attrs['enabled'] = False
|
attrs['enabled'] = False
|
||||||
if 'project' in parsed_args and parsed_args.project is not None:
|
|
||||||
identity_client = client_manager.identity
|
|
||||||
project_id = identity_common.find_project(
|
|
||||||
identity_client,
|
|
||||||
parsed_args.project,
|
|
||||||
parsed_args.project_domain,
|
|
||||||
).id
|
|
||||||
attrs['project_id'] = project_id
|
|
||||||
|
|
||||||
return attrs
|
return attrs
|
||||||
|
|
||||||
@@ -68,12 +59,6 @@ class CreateNetworkFlavorProfile(
|
|||||||
|
|
||||||
def get_parser(self, prog_name):
|
def get_parser(self, prog_name):
|
||||||
parser = super().get_parser(prog_name)
|
parser = super().get_parser(prog_name)
|
||||||
parser.add_argument(
|
|
||||||
'--project',
|
|
||||||
metavar="<project>",
|
|
||||||
help=_("Owner's project (name or ID)"),
|
|
||||||
)
|
|
||||||
identity_common.add_project_domain_option_to_parser(parser)
|
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--description',
|
'--description',
|
||||||
metavar="<description>",
|
metavar="<description>",
|
||||||
@@ -212,7 +197,6 @@ class SetNetworkFlavorProfile(common.NeutronCommandWithExtraArgs):
|
|||||||
metavar="<flavor-profile>",
|
metavar="<flavor-profile>",
|
||||||
help=_("Flavor profile to update (ID only)"),
|
help=_("Flavor profile to update (ID only)"),
|
||||||
)
|
)
|
||||||
identity_common.add_project_domain_option_to_parser(parser)
|
|
||||||
parser.add_argument(
|
parser.add_argument(
|
||||||
'--description',
|
'--description',
|
||||||
metavar="<description>",
|
metavar="<description>",
|
||||||
|
@@ -23,14 +23,11 @@ class TestFlavorProfile(network_fakes.TestNetworkV2):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
super().setUp()
|
super().setUp()
|
||||||
|
|
||||||
# Get the ProjectManager Mock
|
|
||||||
self.projects_mock = self.identity_client.projects
|
|
||||||
# Get the DomainManager Mock
|
# Get the DomainManager Mock
|
||||||
self.domains_mock = self.identity_client.domains
|
self.domains_mock = self.identity_client.domains
|
||||||
|
|
||||||
|
|
||||||
class TestCreateFlavorProfile(TestFlavorProfile):
|
class TestCreateFlavorProfile(TestFlavorProfile):
|
||||||
project = identity_fakes_v3.FakeProject.create_one_project()
|
|
||||||
domain = identity_fakes_v3.FakeDomain.create_one_domain()
|
domain = identity_fakes_v3.FakeDomain.create_one_domain()
|
||||||
new_flavor_profile = network_fakes.create_one_service_profile()
|
new_flavor_profile = network_fakes.create_one_service_profile()
|
||||||
|
|
||||||
@@ -40,7 +37,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
'enabled',
|
'enabled',
|
||||||
'id',
|
'id',
|
||||||
'meta_info',
|
'meta_info',
|
||||||
'project_id',
|
|
||||||
)
|
)
|
||||||
|
|
||||||
data = (
|
data = (
|
||||||
@@ -49,7 +45,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
new_flavor_profile.is_enabled,
|
new_flavor_profile.is_enabled,
|
||||||
new_flavor_profile.id,
|
new_flavor_profile.id,
|
||||||
new_flavor_profile.meta_info,
|
new_flavor_profile.meta_info,
|
||||||
new_flavor_profile.project_id,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
@@ -57,7 +52,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
self.network_client.create_service_profile = mock.Mock(
|
self.network_client.create_service_profile = mock.Mock(
|
||||||
return_value=self.new_flavor_profile
|
return_value=self.new_flavor_profile
|
||||||
)
|
)
|
||||||
self.projects_mock.get.return_value = self.project
|
|
||||||
# Get the command object to test
|
# Get the command object to test
|
||||||
self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
|
self.cmd = network_flavor_profile.CreateNetworkFlavorProfile(
|
||||||
self.app, None
|
self.app, None
|
||||||
@@ -67,10 +61,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
arglist = [
|
arglist = [
|
||||||
"--description",
|
"--description",
|
||||||
self.new_flavor_profile.description,
|
self.new_flavor_profile.description,
|
||||||
"--project",
|
|
||||||
self.new_flavor_profile.project_id,
|
|
||||||
'--project-domain',
|
|
||||||
self.domain.name,
|
|
||||||
"--enable",
|
"--enable",
|
||||||
"--driver",
|
"--driver",
|
||||||
self.new_flavor_profile.driver,
|
self.new_flavor_profile.driver,
|
||||||
@@ -80,8 +70,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
|
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('description', self.new_flavor_profile.description),
|
('description', self.new_flavor_profile.description),
|
||||||
('project', self.new_flavor_profile.project_id),
|
|
||||||
('project_domain', self.domain.name),
|
|
||||||
('enable', True),
|
('enable', True),
|
||||||
('driver', self.new_flavor_profile.driver),
|
('driver', self.new_flavor_profile.driver),
|
||||||
('metainfo', self.new_flavor_profile.meta_info),
|
('metainfo', self.new_flavor_profile.meta_info),
|
||||||
@@ -93,7 +81,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
self.network_client.create_service_profile.assert_called_once_with(
|
self.network_client.create_service_profile.assert_called_once_with(
|
||||||
**{
|
**{
|
||||||
'description': self.new_flavor_profile.description,
|
'description': self.new_flavor_profile.description,
|
||||||
'project_id': self.project.id,
|
|
||||||
'enabled': self.new_flavor_profile.is_enabled,
|
'enabled': self.new_flavor_profile.is_enabled,
|
||||||
'driver': self.new_flavor_profile.driver,
|
'driver': self.new_flavor_profile.driver,
|
||||||
'metainfo': self.new_flavor_profile.meta_info,
|
'metainfo': self.new_flavor_profile.meta_info,
|
||||||
@@ -106,10 +93,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
arglist = [
|
arglist = [
|
||||||
"--description",
|
"--description",
|
||||||
self.new_flavor_profile.description,
|
self.new_flavor_profile.description,
|
||||||
"--project",
|
|
||||||
self.new_flavor_profile.project_id,
|
|
||||||
'--project-domain',
|
|
||||||
self.domain.name,
|
|
||||||
"--enable",
|
"--enable",
|
||||||
"--metainfo",
|
"--metainfo",
|
||||||
self.new_flavor_profile.meta_info,
|
self.new_flavor_profile.meta_info,
|
||||||
@@ -117,8 +100,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
|
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('description', self.new_flavor_profile.description),
|
('description', self.new_flavor_profile.description),
|
||||||
('project', self.new_flavor_profile.project_id),
|
|
||||||
('project_domain', self.domain.name),
|
|
||||||
('enable', True),
|
('enable', True),
|
||||||
('metainfo', self.new_flavor_profile.meta_info),
|
('metainfo', self.new_flavor_profile.meta_info),
|
||||||
]
|
]
|
||||||
@@ -129,7 +110,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
self.network_client.create_service_profile.assert_called_once_with(
|
self.network_client.create_service_profile.assert_called_once_with(
|
||||||
**{
|
**{
|
||||||
'description': self.new_flavor_profile.description,
|
'description': self.new_flavor_profile.description,
|
||||||
'project_id': self.project.id,
|
|
||||||
'enabled': self.new_flavor_profile.is_enabled,
|
'enabled': self.new_flavor_profile.is_enabled,
|
||||||
'metainfo': self.new_flavor_profile.meta_info,
|
'metainfo': self.new_flavor_profile.meta_info,
|
||||||
}
|
}
|
||||||
@@ -141,10 +121,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
arglist = [
|
arglist = [
|
||||||
"--description",
|
"--description",
|
||||||
self.new_flavor_profile.description,
|
self.new_flavor_profile.description,
|
||||||
"--project",
|
|
||||||
self.new_flavor_profile.project_id,
|
|
||||||
'--project-domain',
|
|
||||||
self.domain.name,
|
|
||||||
"--enable",
|
"--enable",
|
||||||
"--driver",
|
"--driver",
|
||||||
self.new_flavor_profile.driver,
|
self.new_flavor_profile.driver,
|
||||||
@@ -152,8 +128,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
|
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('description', self.new_flavor_profile.description),
|
('description', self.new_flavor_profile.description),
|
||||||
('project', self.new_flavor_profile.project_id),
|
|
||||||
('project_domain', self.domain.name),
|
|
||||||
('enable', True),
|
('enable', True),
|
||||||
('driver', self.new_flavor_profile.driver),
|
('driver', self.new_flavor_profile.driver),
|
||||||
]
|
]
|
||||||
@@ -164,7 +138,6 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
self.network_client.create_service_profile.assert_called_once_with(
|
self.network_client.create_service_profile.assert_called_once_with(
|
||||||
**{
|
**{
|
||||||
'description': self.new_flavor_profile.description,
|
'description': self.new_flavor_profile.description,
|
||||||
'project_id': self.project.id,
|
|
||||||
'enabled': self.new_flavor_profile.is_enabled,
|
'enabled': self.new_flavor_profile.is_enabled,
|
||||||
'driver': self.new_flavor_profile.driver,
|
'driver': self.new_flavor_profile.driver,
|
||||||
}
|
}
|
||||||
@@ -176,17 +149,11 @@ class TestCreateFlavorProfile(TestFlavorProfile):
|
|||||||
arglist = [
|
arglist = [
|
||||||
"--description",
|
"--description",
|
||||||
self.new_flavor_profile.description,
|
self.new_flavor_profile.description,
|
||||||
"--project",
|
|
||||||
self.new_flavor_profile.project_id,
|
|
||||||
'--project-domain',
|
|
||||||
self.domain.name,
|
|
||||||
"--enable",
|
"--enable",
|
||||||
]
|
]
|
||||||
|
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('description', self.new_flavor_profile.description),
|
('description', self.new_flavor_profile.description),
|
||||||
('project', self.new_flavor_profile.project_id),
|
|
||||||
('project_domain', self.domain.name),
|
|
||||||
('enable', True),
|
('enable', True),
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -377,7 +344,6 @@ class TestShowFlavorProfile(TestFlavorProfile):
|
|||||||
'enabled',
|
'enabled',
|
||||||
'id',
|
'id',
|
||||||
'meta_info',
|
'meta_info',
|
||||||
'project_id',
|
|
||||||
)
|
)
|
||||||
data = (
|
data = (
|
||||||
network_flavor_profile.description,
|
network_flavor_profile.description,
|
||||||
@@ -385,7 +351,6 @@ class TestShowFlavorProfile(TestFlavorProfile):
|
|||||||
network_flavor_profile.is_enabled,
|
network_flavor_profile.is_enabled,
|
||||||
network_flavor_profile.id,
|
network_flavor_profile.id,
|
||||||
network_flavor_profile.meta_info,
|
network_flavor_profile.meta_info,
|
||||||
network_flavor_profile.project_id,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
|
Reference in New Issue
Block a user