From dad021430c7941caf22bc678b621dab2800b40c4 Mon Sep 17 00:00:00 2001
From: Andy Grover <agrover@redhat.com>
Date: Tue, 19 Aug 2014 17:48:08 -0700
Subject: Update for removal of pass_level TCMU parameter

pass_level parameter is gone, so UsedBackedStorageObject doesn't need to
take it as a parameter, save it, etc.

Signed-off-by: Andy Grover <agrover@redhat.com>
---
 rtslib/tcm.py | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/rtslib/tcm.py b/rtslib/tcm.py
index b439d3f..65628bf 100644
--- a/rtslib/tcm.py
+++ b/rtslib/tcm.py
@@ -738,7 +738,7 @@ class UserBackedStorageObject(StorageObject):
     An interface to configFS storage objects for userspace-backed backstore.
     '''
 
-    def __init__(self, name, size=None, wwn=None, config=None, level=None):
+    def __init__(self, name, size=None, wwn=None, config=None):
         '''
         @param name: The name of the UserBackedStorageObject.
         @type name: string
@@ -752,30 +752,26 @@ class UserBackedStorageObject(StorageObject):
         @param config: user-handler-specific config string.
             - e.g. "rbd://machine1@snap4"
         @type config: string
-        @param level: TCMU emulation level, 1, 2, or 3
-        @type level: int
         @return: A UserBackedStorageObject object.
         '''
 
         if size is not None:
             super(UserBackedStorageObject, self).__init__(name, 'create')
             try:
-                self._configure(size, wwn, config, level)
+                self._configure(size, wwn, config)
             except:
                 self.delete()
                 raise
         else:
             super(UserBackedStorageObject, self).__init__(name, 'lookup')
 
-    def _configure(self, size, wwn, config, level):
+    def _configure(self, size, wwn, config):
         self._check_self()
 
         if config:
             if ':' in config:
                 raise RTSLibError("':' not allowed in config string")
             self._control("dev_config=%s" % config)
-        if level:
-            self._control("pass_level=%d" % int(level))
         self._control("dev_size=%d" % size)
         self._enable()
 
@@ -783,11 +779,7 @@ class UserBackedStorageObject(StorageObject):
 
     def _get_size(self):
         self._check_self()
-        return int(self._parse_info('Dev_size'))
-
-    def _get_level(self):
-        self._check_self()
-        return int(self._parse_info('Pass_level'))
+        return int(self._parse_info('Size'))
 
     def _get_config(self):
         self._check_self()
@@ -798,8 +790,6 @@ class UserBackedStorageObject(StorageObject):
 
     size = property(_get_size,
             doc="Get the size in bytes.")
-    level = property(_get_level,
-            doc="Get the command emulation level.")
     config = property(_get_config,
             doc="Get the TCMU config.")
 
@@ -807,7 +797,6 @@ class UserBackedStorageObject(StorageObject):
         d = super(UserBackedStorageObject, self).dump()
         d['wwn'] = self.wwn
         d['size'] = self.size
-        d['level'] = self.level
         if self.config:
             d['config'] = self.config
         return d
-- 
cgit v1.2.1