Merge "Remove legacy patching code"

fuelclient/cli/actions/environment.py

@@ -47,9 +47,6 @@ class EnvironmentAction(Action):
                     "Create a new environment with "
                     "specific release id and name"
                 ),
-                Args.get_update_arg(
-                    "Update OS to specified release id for given env"
-                )
             ),
             Args.get_release_arg(
                 "Release id"
@@ -80,7 +77,6 @@ class EnvironmentAction(Action):
             ("create", self.create),
             ("set", self.set),
             ("delete", self.delete),
-            ("update", self.update),
             (None, self.list)
         )
 
@@ -119,7 +115,7 @@ class EnvironmentAction(Action):
         """To change environment name:
                 fuel --env 1 env set --name NewEnvName
         """
-        acceptable_params = ('name', 'pending_release_id')
+        acceptable_params = ('name', )
 
         env = Environment(params.env, params=params)
 
@@ -171,8 +167,7 @@ class EnvironmentAction(Action):
         """Print all available environments:
                 fuel env
         """
-        acceptable_keys = ("id", "status", "name",
-                           "release_id", "pending_release_id")
+        acceptable_keys = ("id", "status", "name", "release_id", )
         data = Environment.get_all_data()
         if params.env:
             data = filter(
@@ -187,24 +182,6 @@ class EnvironmentAction(Action):
             )
         )
 
-    def update(self, params):
-        """Update environment to given OS release:
-                fuel env --env 1 --update --release 1
-        """
-        params.pending_release_id = params.release
-        self.set(params)
-
-        env = Environment(params.env, params=params)
-        update_task = env.update_env()
-
-        msg = ("Update process for environment has been started. "
-               "Update task id is {0}".format(update_task.id))
-
-        self.serializer.print_to_output(
-            {},
-            msg
-        )
-
     @check_all("env")
     @check_any("download", "upload")
     def deployment_tasks(self, params):

fuelclient/cli/arguments.py

@@ -390,11 +390,6 @@ def get_list_arg(help_msg):
     return get_boolean_arg("list", flags=("-l",), help=help_msg)
 
 
-def get_update_arg(help_msg):
-    return get_boolean_arg("update",
-                           flags=("--env-update",), help=help_msg)
-
-
 def get_dir_arg(help_msg):
     return get_str_arg("dir", default=os.curdir, help=help_msg)
 

fuelclient/commands/environment.py

@@ -38,7 +38,6 @@ class EnvShow(EnvMixIn, base.BaseShowCommand):
                "fuel_version",
                "name",
                "release_id",
-               "pending_release_id",
                "is_customized",
                "changes")
 
@@ -152,32 +151,6 @@ class EnvUpdate(EnvMixIn, base.BaseShowCommand):
         return (self.columns, updated_env)
 
 
-class EnvUpgrade(EnvMixIn, base.BaseCommand):
-    """Upgrades environment to given relese."""
-
-    def get_parser(self, prog_name):
-        parser = super(EnvUpgrade, self).get_parser(prog_name)
-
-        parser.add_argument('id',
-                            type=int,
-                            help='Id of the environmen to be upgraded.')
-
-        parser.add_argument('pending_release_id',
-                            type=int,
-                            help='Relese id for upgrading the environment to')
-
-        return parser
-
-    def take_action(self, parsed_args):
-        task_id = self.client.upgrade(parsed_args.id,
-                                      parsed_args.pending_release_id)
-
-        msg = 'Upgrade task with id {0} for the environment '\
-              'has been started.\n'.format(task_id)
-
-        self.app.stdout.write(msg)
-
-
 class EnvAddNodes(EnvMixIn, base.BaseCommand):
     """Adds nodes to an environment with the specified roles."""
 

fuelclient/objects/environment.py

@@ -55,14 +55,6 @@ class Environment(BaseObject):
             data
         )
 
-    def update_env(self):
-        return Task.init_with_data(
-            self.connection.put_request(
-                "clusters/{0}/update/".format(self.id),
-                {}
-            )
-        )
-
     def delete(self):
         return self.connection.delete_request(
             "clusters/{0}/".format(self.id)

fuelclient/tests/functional/v1/test_client.py

@@ -25,11 +25,11 @@ class TestHandlers(base.BaseTestCase):
     def test_env_action(self):
         # check env help
         help_msgs = ["usage: fuel environment [-h]",
-                     "[--list | --set | --delete | --create | --update]",
+                     "[--list | --set | --delete | --create]",
                      "optional arguments:", "--help", "--list", "--set",
                      "--delete", "--rel", "--env-create",
                      "--create", "--name", "--env-name", "--nst",
-                     "--net-segment-type", "--update", "--env-update"]
+                     "--net-segment-type"]
         self.check_all_in_msg("env --help", help_msgs)
         # no clusters
         self.check_for_rows_in_table("env")

fuelclient/tests/unit/v1/test_vip_action.py

@@ -37,7 +37,6 @@ ENV_OUTPUT = {
     "net_provider": "neutron",
     "mode": "ha_compact",
     "components": [],
-    "pending_release_id": None,
     "changes": [
         {"node_id": None, "name": "attributes"},
         {"node_id": None, "name": "networks"},

fuelclient/tests/unit/v2/cli/test_env.py

@@ -116,13 +116,6 @@ class TestEnvCommand(test_engine.BaseCLITest):
         self.m_client.update.assert_called_once_with(environment_id=42,
                                                      name='test_name')
 
-    def test_env_upgrade(self):
-        args = 'env upgrade 10 15'
-        self.exec_command(args)
-
-        self.m_get_client.assert_called_once_with('environment', mock.ANY)
-        self.m_client.upgrade.assert_called_once_with(10, 15)
-
     def test_env_spawn_vms(self):
         env_id = 10
         args = 'env spawn-vms {0}'.format(env_id)

fuelclient/tests/unit/v2/lib/test_environment.py

@@ -121,22 +121,6 @@ class TestEnvFacade(test_api.BaseLibTest):
 
         self.assertTrue(matcher.called)
 
-    @mock.patch.object(base_object.BaseObject, 'init_with_data')
-    def test_env_upgrade(self, m_init):
-        env_id = 42
-        release_id = 10
-
-        node_uri = self.get_object_uri(self.res_uri, env_id)
-        update_uri = self.get_object_uri(self.res_uri, env_id, '/update/')
-
-        put_matcher = self.m_request.put(node_uri, json=self.fake_env)
-        update_matcher = self.m_request.put(update_uri, json={})
-
-        self.client.upgrade(env_id, release_id)
-
-        self.assertTrue(put_matcher.called)
-        self.assertTrue(update_matcher.called)
-
     @mock.patch.object(base_object.BaseObject, 'init_with_data')
     def test_env_update(self, m_init):
         env_id = 42

fuelclient/tests/utils/fake_env.py

@@ -16,7 +16,7 @@
 
 
 def get_fake_env(name=None, status=None, release_id=None,
-                 fuel_version=None, pending_release=None, env_id=None):
+                 fuel_version=None, env_id=None):
     """Create a random fake environment
 
     Returns the serialized and parametrized representation of a dumped Fuel
@@ -28,6 +28,5 @@ def get_fake_env(name=None, status=None, release_id=None,
             'release_id': release_id or 2,
             'name': name or 'fake_env',
             'fuel_version': fuel_version or '9.0',
-            'pending_release_id': pending_release,
             'id': env_id or 1,
             'changes': []}

fuelclient/v1/environment.py

@@ -55,14 +55,6 @@ class EnvironmentClient(base_v1.BaseV1Client):
 
         return env.data
 
-    def upgrade(self, environment_id, release_id):
-        env = self._entity_wrapper(obj_id=environment_id)
-
-        update = {'pending_release_id': release_id}
-        env.set(update)
-
-        return env.update_env()
-
     def delete_by_id(self, environment_id):
         env_obj = self._entity_wrapper(obj_id=environment_id)
         env_obj.delete()

setup.cfg

@@ -37,7 +37,6 @@ fuelclient =
     env_show=fuelclient.commands.environment:EnvShow
     env_spawn-vms=fuelclient.commands.environment:EnvSpawnVms
     env_update=fuelclient.commands.environment:EnvUpdate
-    env_upgrade=fuelclient.commands.environment:EnvUpgrade
     fuel-version=fuelclient.commands.fuelversion:FuelVersion
     network-group_create=fuelclient.commands.network_group:NetworkGroupCreate
     network-group_delete=fuelclient.commands.network_group:NetworkGroupDelete