From 1ad0da03904fa2ddfdf5016b54ea26dea969795a Mon Sep 17 00:00:00 2001
From: Mike Tutkowski <mike.tutkowski@solidfire.com>
Date: Mon, 2 May 2016 15:23:56 -0600
Subject: [PATCH] CLOUDSTACK-9373: Removing a few instance methods where there
 are class methods that are overshadowing them

---
 tools/marvin/marvin/lib/base.py | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index f5f53a5d85b..1be0a3c209d 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -2587,13 +2587,6 @@ class Host:
         apiclient.deleteHost(cmd)
         return
 
-    def enableMaintenance(self, apiclient):
-        """enables maintenance mode Host"""
-
-        cmd = prepareHostForMaintenance.prepareHostForMaintenanceCmd()
-        cmd.id = self.id
-        return apiclient.prepareHostForMaintenance(cmd)
-
     @classmethod
     def enableMaintenance(cls, apiclient, id):
         """enables maintenance mode Host"""
@@ -2602,13 +2595,6 @@ class Host:
         cmd.id = id
         return apiclient.prepareHostForMaintenance(cmd)
 
-    def cancelMaintenance(self, apiclient):
-        """Cancels maintenance mode Host"""
-
-        cmd = cancelHostMaintenance.cancelHostMaintenanceCmd()
-        cmd.id = self.id
-        return apiclient.cancelHostMaintenance(cmd)
-
     @classmethod
     def cancelMaintenance(cls, apiclient, id):
         """Cancels maintenance mode Host"""
@@ -2758,13 +2744,6 @@ class StoragePool:
         apiclient.deleteStoragePool(cmd)
         return
 
-    def enableMaintenance(self, apiclient):
-        """enables maintenance mode Storage pool"""
-
-        cmd = enableStorageMaintenance.enableStorageMaintenanceCmd()
-        cmd.id = self.id
-        return apiclient.enableStorageMaintenance(cmd)
-
     @classmethod
     def enableMaintenance(cls, apiclient, id):
         """enables maintenance mode Storage pool"""