Change in vdsm[master]: Introduce getLocalPathBase for MountConnection
by deepakcs@linux.vnet.ibm.com
Deepak C Shetty has uploaded a new change for review.
Change subject: Introduce getLocalPathBase for MountConnection
......................................................................
Introduce getLocalPathBase for MountConnection
Introduce getLocalPathBase in MountConnection so that
class re-using it can override it to present their own
path base.
Change-Id: I9985cb00b8ae7dc4a0ac840d3eb3adadf902d61b
Signed-off-by: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com>
---
M vdsm/storage/storageServer.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/12126/1
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index 80668bf..94b56a9 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -181,6 +181,10 @@
def setLocalPathBase(cls, path):
cls.localPathBase = path
+ @classmethod
+ def getLocalPathBase(cls):
+ return cls.localPathBase
+
def __init__(self, spec, vfsType=None, options=""):
self._vfsType = vfsType
self._remotePath = spec
@@ -188,7 +192,7 @@
self._mount = mount.Mount(spec, self._getLocalPath())
def _getLocalPath(self):
- return os.path.join(self.localPathBase,
+ return os.path.join(self.getLocalPathBase(),
self._remotePath.replace("_",
"__").replace("/", "_"))
--
To view, visit http://gerrit.ovirt.org/12126
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9985cb00b8ae7dc4a0ac840d3eb3adadf902d61b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Deepak C Shetty <deepakcs(a)linux.vnet.ibm.com>
11 years, 1 month
Change in vdsm[master]: configNetwork: improve assertBridgeClean
by mhuntxu@gmail.com
Hunt Xu has uploaded a new change for review.
Change subject: configNetwork: improve assertBridgeClean
......................................................................
configNetwork: improve assertBridgeClean
Change-Id: I44b28e16d20e993c84d0569db7c661e18d432ce7
Signed-off-by: huntxu <mhuntxu(a)gmail.com>
---
M vdsm/configNetwork.py
1 file changed, 6 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/04/12504/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 72d1354..f2b492d 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -989,20 +989,14 @@
def assertBridgeClean(bridge, vlan, bonding, nics):
- brifs = netinfo.ports(bridge)
- for nic in nics:
- try:
- brifs.remove(nic)
- except:
- pass
+ ports = netinfo.ports(bridge)
+ brifs = list(nics)
if vlan:
- brif = (bonding or nics[0]) + '.' + vlan
+ brifs.append((bonding or nics[0]) + '.' + vlan)
else:
- brif = bonding
- try:
- brifs.remove(brif)
- except:
- pass
+ brifs.append(bonding)
+
+ brifs = list(set(ports) - set(brifs))
if brifs:
raise ConfigNetworkError(ne.ERR_USED_BRIDGE, 'bridge %s has interfaces'
--
To view, visit http://gerrit.ovirt.org/12504
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I44b28e16d20e993c84d0569db7c661e18d432ce7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Hunt Xu <mhuntxu(a)gmail.com>
11 years, 1 month
Change in vdsm[master]: network: reuse netinfo.ports()
by mhuntxu@gmail.com
Hunt Xu has uploaded a new change for review.
Change subject: network: reuse netinfo.ports()
......................................................................
network: reuse netinfo.ports()
Change-Id: I77e542cb0982e792e29d092f9e911cf74d910d36
Signed-off-by: huntxu <mhuntxu(a)gmail.com>
---
M vdsm/configNetwork.py
M vdsm/netinfo.py
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/03/12503/1
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index 2470419..72d1354 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -989,7 +989,7 @@
def assertBridgeClean(bridge, vlan, bonding, nics):
- brifs = os.listdir('/sys/class/net/%s/brif/' % bridge)
+ brifs = netinfo.ports(bridge)
for nic in nics:
try:
brifs.remove(nic)
diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py
index fadc86e..56999b5 100644
--- a/vdsm/netinfo.py
+++ b/vdsm/netinfo.py
@@ -195,7 +195,7 @@
def graph():
for bridge in bridges():
print bridge
- for iface in os.listdir('/sys/class/net/' + bridge + '/brif'):
+ for iface in ports(bridge):
print '\t' + iface
if iface in vlans():
iface = iface.split('.')[0]
@@ -211,7 +211,7 @@
raise ValueError('unknown bridge %s' % bridge)
vlan = bonding = ''
nics = []
- for iface in os.listdir('/sys/class/net/' + bridge + '/brif'):
+ for iface in ports(bridge):
if iface in vlans():
iface, vlan = iface.split('.')
if iface in bondings():
--
To view, visit http://gerrit.ovirt.org/12503
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I77e542cb0982e792e29d092f9e911cf74d910d36
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Hunt Xu <mhuntxu(a)gmail.com>
11 years, 1 month
Change in vdsm[master]: [WIP] Add copyVolumes command to the SPM
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: [WIP] Add copyVolumes command to the SPM
......................................................................
[WIP] Add copyVolumes command to the SPM
Early implementation (the API might change).
Change-Id: Ia19dd9b779a06ff88efed2eef52c1d152cdc797c
---
M vdsm/API.py
M vdsm/BindingXMLRPC.py
M vdsm/storage/hsm.py
M vdsm/storage/image.py
M vdsm/storage/sp.py
5 files changed, 92 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/85/2885/1
--
To view, visit http://gerrit.ovirt.org/2885
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia19dd9b779a06ff88efed2eef52c1d152cdc797c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years, 1 month
Change in vdsm[master]: Don't rotate core dump logs on Fedora
by Federico Simoncelli
Federico Simoncelli has uploaded a new change for review.
Change subject: Don't rotate core dump logs on Fedora
......................................................................
Don't rotate core dump logs on Fedora
Core dumps are a system-level configuration and VDSM shouldn't try to
override what the sysadmin decides.
Change-Id: I0a2e86614475fd13de3888b956b5512a24016281
---
M configure.ac
M vdsm.spec.in
M vdsm/Makefile.am
A vdsm/cdumps-logrotate.conf
A vdsm/vdsm-logrotate.conf
D vdsm/vdsm-logrotate.conf.in
6 files changed, 27 insertions(+), 22 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/91/991/1
--
To view, visit http://gerrit.ovirt.org/991
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a2e86614475fd13de3888b956b5512a24016281
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>
11 years, 1 month