openstack
/
python-fuelclient
Code Issues Proposed changes

remove vmware 

VMware not supported since Fuel 10. So this commit removes
vmware-related part of CLI fuel client.

Change-Id: I8da5aad94d34fc458fadfad4d38aa6607060b4a3
Implements: blueprint remove-vmware
This commit is contained in:
Igor Gajsin 2017-02-15 17:20:53 +03:00
parent 438bce600f
commit a78cd6e107
5 changed files with 1 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuelclient/cli/actions/__init__.py
View File

@ -38,7 +38,6 @@ from fuelclient.cli.actions.openstack_config import OpenstackConfigAction
from fuelclient.cli.actions.release import ReleaseAction
from fuelclient.cli.actions.role import RoleAction
from fuelclient.cli.actions.settings import SettingsAction
from fuelclient.cli.actions.settings import VmwareSettingsAction
from fuelclient.cli.actions.snapshot import SnapshotAction
from fuelclient.cli.actions.user import UserAction
from fuelclient.cli.actions.plugins import PluginAction
@ -73,7 +72,6 @@ actions_tuple = (
TokenAction,
UserAction,
VIPAction,
VmwareSettingsAction,
)
actions = dict(

50
fuelclient/cli/actions/settings.py
View File

@ -84,53 +84,3 @@ class SettingsAction(Action):
" downloaded to {1}"
.format(env.id, settings_file_path)
)
class VmwareSettingsAction(SettingsAction):
"""Show or modify environment vmware settings
"""
action_name = "vmware-settings"
def upload(self, params):
"""To upload vmware settings for some environment from some directory:
fuel --env 1 vmware-settings --upload --dir path/to/directory
"""
env = Environment(params.env)
vmware_settings_data = env.read_vmware_settings_data(
directory=params.dir,
serializer=self.serializer
)
env.set_vmware_settings_data(vmware_settings_data)
print("Vmware settings configuration uploaded.")
def default(self, params):
"""To download default vmware settings for some environment
in some directory:
fuel --env 1 vmware-settings --default --dir path/to/directory
"""
env = Environment(params.env)
vmware_default_data = env.get_default_vmware_settings_data()
settings_file_path = env.write_vmware_settings_data(
vmware_default_data,
directory=params.dir,
serializer=self.serializer)
print(
"Default vmware settings configuration downloaded to {0}."
.format(settings_file_path)
)
def download(self, params):
"""To download vmware settings for some environment in this directory:
fuel --env 1 vmware-settings --download
"""
env = Environment(params.env)
settings_data = env.get_vmware_settings_data()
settings_file_path = env.write_vmware_settings_data(
settings_data,
directory=params.dir,
serializer=self.serializer)
print(
"Vmware settings configuration for environment with id={0}"
" downloaded to {1}"
.format(env.id, settings_file_path)
)

38
fuelclient/objects/environment.py
View File

@ -119,12 +119,6 @@ class Environment(BaseObject):
"settings_{0}".format(self.id)
)
def get_vmware_settings_data_path(self, directory=os.curdir):
return os.path.join(
os.path.abspath(directory),
"vmware_settings_{0}".format(self.id)
)
def get_network_template_data_path(self, directory=None):
directory = directory or os.curdir
return os.path.join(
@ -148,15 +142,6 @@ class Environment(BaseObject):
settings_data
)
def write_vmware_settings_data(self, settings_data, directory=None,
serializer=None):
directory = directory or os.curdir
self._check_dir(directory)
return (serializer or self.serializer).write_to_path(
self.get_vmware_settings_data_path(directory),
settings_data
)
def write_network_template_data(self, template_data, directory=None,
serializer=None):
directory = directory or os.curdir
@ -191,11 +176,6 @@ class Environment(BaseObject):
raise error.InvalidDirectoryException(
"Error: '{0}' is not a directory.".format(directory))
def read_vmware_settings_data(self, directory=os.curdir, serializer=None):
self._check_dir(directory)
return (serializer or self.serializer).read_from_file(
self.get_vmware_settings_data_path(directory))
def read_network_template_data(self, directory=os.curdir,
serializer=None):
"""Used by 'fuel' command line utility."""
@ -223,14 +203,6 @@ class Environment(BaseObject):
def default_settings_url(self):
return self.settings_url + "/defaults"
@property
def vmware_settings_url(self):
return "clusters/{0}/vmware_attributes".format(self.id)
@property
def default_vmware_settings_url(self):
return self.vmware_settings_url + "/defaults"
@property
def network_url(self):
return "clusters/{id}/network_configuration/neutron".format(
@ -254,12 +226,6 @@ class Environment(BaseObject):
def get_default_settings_data(self):
return self.connection.get_request(self.default_settings_url)
def get_vmware_settings_data(self):
return self.connection.get_request(self.vmware_settings_url)
def get_default_vmware_settings_data(self):
return self.connection.get_request(self.default_vmware_settings_url)
def get_network_template_data(self):
return self.connection.get_request(self.network_template_url)
@ -276,10 +242,6 @@ class Environment(BaseObject):
self.settings_url, data)
return result
def set_vmware_settings_data(self, data):
return self.connection.put_request(
self.vmware_settings_url, data)
def verify_network(self):
return self.connection.put_request(
self.network_verification_url, self.get_network_data())

21
fuelclient/tests/unit/common/test_settings.py
View File

@ -95,24 +95,3 @@ class TestSettings(BaseSettings):
test_command=[
'fuel', 'settings', '--env', '1', '--download'],
test_url='/api/v1/clusters/1/attributes')
class TestVmwareSettings(BaseSettings):
def test_upload_action(self):
self.check_upload_action(
test_command=[
'fuel', 'vmware-settings', '--env', '1', '--upload'],
test_url='/api/v1/clusters/1/vmware_attributes')
def test_default_action(self):
self.check_default_action(
test_command=[
'fuel', 'vmware-settings', '--env', '1', '--default'],
test_url='/api/v1/clusters/1/vmware_attributes/defaults')
def test_download_action(self):
self.check_download_action(
test_command=[
'fuel', 'vmware-settings', '--env', '1', '--download'],
test_url='/api/v1/clusters/1/vmware_attributes')

3
fuelclient/tests/unit/v1/test_vip_action.py
View File

@ -39,8 +39,7 @@ ENV_OUTPUT = {
"components": [],
"changes": [
{"node_id": None, "name": "attributes"},
{"node_id": None, "name": "networks"},
{"node_id": None, "name": "vmware_attributes"}],
{"node_id": None, "name": "networks"}],
"id": 6, "name": "test_not_deployed"}