Skip to content

Commit 5f85000

Browse files
author
Tim Smith
committed
CP-54351 move SR from /opt
Signed-off-by: Tim Smith <tim.smith@cloud.com>
1 parent 3f7f8f2 commit 5f85000

32 files changed

Lines changed: 661 additions & 659 deletions

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ SM_LIBS += nfs
5454
SM_LIBS += pluginutil
5555
SM_LIBS += refcounter
5656
SM_LIBS += resetvdis
57+
SM_LIBS += SR
5758
SM_LIBS += SRCommand
5859
SM_LIBS += srmetadata
5960
SM_LIBS += sysdevice

drivers/DummySR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
# DummySR: an example dummy SR for the SDK
1919

20-
import SR
20+
from sm import SR
2121
from sm import VDI
2222
from sm import SRCommand
2323
from sm.core import util

drivers/EXTSR.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
#
1818
# EXTSR: Based on local-file storage repository, mounts ext3 partition
1919

20-
import SR
21-
from SR import deviceCheck
20+
from sm import SR
21+
from sm.SR import deviceCheck
2222
from sm import SRCommand
2323
import FileSR
2424
from sm.core import util

drivers/FileSR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
# FileSR: local-file storage repository
1919

20-
import SR
20+
from sm import SR
2121
from sm import VDI
2222
from sm import SRCommand
2323
from sm.core import util

drivers/HBASR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# hardware based iSCSI
2020
#
2121

22-
import SR
22+
from sm import SR
2323
from sm import SRCommand
2424
from sm import devscan
2525
from sm.core import scsiutil

drivers/ISOSR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#
1818
# ISOSR: remote iso storage repository
1919

20-
import SR
20+
from sm import SR
2121
from sm import VDI
2222
from sm import SRCommand
2323
from sm.core import util

drivers/LVHDSR.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import re
2525
import glob
2626

27-
import SR
28-
from SR import deviceCheck
27+
from sm import SR
28+
from sm.SR import deviceCheck
2929
from sm import VDI
3030
from sm import SRCommand
3131
from sm.core import util

drivers/LVHDoHBASR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# hardware based iSCSI
2020
#
2121

22-
import SR
22+
from sm import SR
2323
import LVHDSR
2424
from sm import SRCommand
2525
from sm import lvutil

drivers/LVHDoISCSISR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# LVHDoISCSISR: LVHD over ISCSI software initiator SR driver
1919
#
2020

21-
import SR
21+
from sm import SR
2222
import LVHDSR
2323
from sm import BaseISCSI
2424
from sm import SRCommand

drivers/NFSSR.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import socket
2121

22-
import SR
22+
from sm import SR
2323
from sm import SRCommand
2424
import FileSR
2525
from sm.core import util

0 commit comments

Comments
 (0)