Merge "Remove deprecated methods and properties"

1 files changed, 3 insertions, 36 deletions

diff --git a/novaclient/v2/client.py b/novaclient/v2/client.py
index 54abcf27..cec9f2f6 100644
--- a/novaclient/v2/client.py
+++ b/novaclient/v2/client.py
@@ -223,50 +223,17 @@ class Client(object):
     def api_version(self, value):
         self.client.api_version = value
 
-    @property
-    def projectid(self):
-        self.logger.warning(_("Property 'projectid' is deprecated since "
-                              "Ocata. Use 'project_name' instead."))
-        return self.project_name
-
-    @property
-    def tenant_id(self):
-        self.logger.warning(_("Property 'tenant_id' is deprecated since "
-                              "Ocata. Use 'project_id' instead."))
-        return self.project_id
-
     def __enter__(self):
-        self.logger.warning(_("NovaClient instance can't be used as a "
-                              "context manager since Ocata (deprecated "
-                              "behaviour) since it is redundant in case of "
-                              "SessionClient."))
-        return self
+        raise exceptions.InvalidUsage(_(
+            "NovaClient instance can't be used as a context manager "
+            "since it is redundant in case of SessionClient."))
 
     def __exit__(self, t, v, tb):
         # do not do anything
         pass
 
-    def set_management_url(self, url):
-        self.logger.warning(
-            _("Method `set_management_url` is deprecated since Ocata. "
-              "Use `endpoint_override` argument instead while initializing "
-              "novaclient's instance."))
-        self.client.set_management_url(url)
-
     def get_timings(self):
         return self.client.get_timings()
 
     def reset_timings(self):
         self.client.reset_timings()
-
-    def authenticate(self):
-        """Authenticate against the server.
-
-        Normally this is called automatically when you first access the API,
-        but you can call this method to force authentication right now.
-
-        Returns on success; raises :exc:`exceptions.Unauthorized` if the
-        credentials are wrong.
-        """
-        self.logger.warning(_(
-            "Method 'authenticate' is deprecated since Ocata."))