Change in vdsm[master]: VDSM: implement nodeDeviceMapper

Thursday, 17 July 2014

Martin Polednik has uploaded a new change for review.

Change subject: VDSM: implement nodeDeviceMapper
......................................................................

VDSM: implement nodeDeviceMapper

NodeDeviceMapper is structure to keep track of available node devices
and provide easy access to querying and managing them. The mapper
is needed in order to allow VDSM to meaningfully report the usage
of these devices, along with managing their availability.

Change-Id: I6f21d465a90cfe2eb16ba70943e5fcf1683f1656
Signed-off-by: Martin Polednik <mpoledni(a)redhat.com&gt;
---
M client/vdsClient.py
M debian/vdsm.install
M vdsm.spec.in
M vdsm/API.py
M vdsm/clientIF.py
M vdsm/rpc/BindingXMLRPC.py
M vdsm/virt/Makefile.am
7 files changed, 44 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/30209/1

diff --git a/client/vdsClient.py b/client/vdsClient.py
index 2c09b28..89dceab 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -461,6 +461,14 @@
     def do_getAllVmStats(self, args):
         return self.ExecAndExit(self.s.getAllVmStats())
 
+    def do_getDevicesByCaps(self, args):
+        caps = list(args)
+        return self.ExecAndExit(self.s.getDevicesByCaps(caps))
+
+    def do_getDevicesByDomain(self, args):
+        vmId = args[0]
+        return self.ExecAndExit(self.s.getDevicesByDomain(vmId))
+
     def desktopLogin(self, args):
         vmId, domain, user, password = tuple(args)
         response = self.s.desktopLogin(vmId, domain, user, password)
@@ -2077,6 +2085,16 @@
                           ('',
                            'Get Statistics info for all existing VMs'
                            )),
+        'getDevicesByCaps': (serv.do_getDevicesByCaps,
+                             ('[<caps>]',
+                              'Get available node devices on the host with '
+                              'given capability'
+                              )),
+        'getDevicesByDomain': (serv.do_getDevicesByDomain,
+                             ('<vmId>',
+                              'Get available node devices attached to specified
'
+                              'domain'
+                              )),
         'getVGList': (serv.getVGList,
                       ('storageType',
                        'List of all VGs.'
diff --git a/debian/vdsm.install b/debian/vdsm.install
index 3af1100..e1d8652 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -142,6 +142,7 @@
 ./usr/share/vdsm/virt/__init__.py
 ./usr/share/vdsm/virt/guestagent.py
 ./usr/share/vdsm/virt/migration.py
+./usr/share/vdsm/virt/nodedev.py
 ./usr/share/vdsm/virt/sampling.py
 ./usr/share/vdsm/virt/vm.py
 ./usr/share/vdsm/virt/vmchannels.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 16b7834..0ddacbe 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -939,6 +939,7 @@
 %{_datadir}/%{vdsm_name}/virt/__init__.py*
 %{_datadir}/%{vdsm_name}/virt/guestagent.py*
 %{_datadir}/%{vdsm_name}/virt/migration.py*
+%{_datadir}/%{vdsm_name}/virt/nodedev.py*
 %{_datadir}/%{vdsm_name}/virt/vmchannels.py*
 %{_datadir}/%{vdsm_name}/virt/vmstatus.py*
 %{_datadir}/%{vdsm_name}/virt/vmtune.py*
diff --git a/vdsm/API.py b/vdsm/API.py
index 6feccf6..e891b80 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -1244,6 +1244,18 @@
         statsList = hooks.after_get_all_vm_stats(statsList)
         return {'status': doneCode, 'statsList': statsList}
 
+    def getDevicesByCaps(self, caps):
+        """
+        """
+        devices = self._cif.nodeDeviceMapper.getDevicesByCaps(caps)
+        return {'status': doneCode, 'devices': devices}
+
+    def getDevicesByDomain(self, vmId):
+        """
+        """
+        devices = self._cif.nodeDeviceMapper.getDevicesByDomain(vmId)
+        return {'status': doneCode, 'devices': devices}
+
     def getStats(self):
         """
         Report host statistics.
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index d5372f3..118652d 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -91,6 +91,7 @@
             self.gluster = None
         try:
             self.vmContainer = {}
+            self.nodeDeviceMapper = NodeDeviceMapper(vmContainer, log)
             self._hostStats = sampling.HostStatsThread(log=log)
             self._hostStats.start()
             self.lastRemoteAccess = 0
diff --git a/vdsm/rpc/BindingXMLRPC.py b/vdsm/rpc/BindingXMLRPC.py
index d6663c3..a31d76c 100644
--- a/vdsm/rpc/BindingXMLRPC.py
+++ b/vdsm/rpc/BindingXMLRPC.py
@@ -482,6 +482,14 @@
         api = API.Global()
         return api.getAllVmStats()
 
+    def getDevicesByCaps(self, caps):
+        api = API.Global()
+        return api.getDevicesByCaps(caps)
+
+    def getDevicesByDomain(self, vmId):
+        api = API.Global()
+        return api.getDevicesByDomain(vmId)
+
     def vmGetIoTunePolicy(self, vmId):
         vm = API.VM(vmId)
         return vm.getIoTunePolicy()
@@ -989,6 +997,8 @@
                 (self.getStats, 'getVdsStats'),
                 (self.vmGetStats, 'getVmStats'),
                 (self.getAllVmStats, 'getAllVmStats'),
+                (self.getDevicesByCaps, 'getDevicesByCaps'),
+                (self.getDevicesByDomain, 'getDevicesByDomain'),
                 (self.vmMigrationCreate, 'migrationCreate'),
                 (self.vmDesktopLogin, 'desktopLogin'),
                 (self.vmDesktopLogoff, 'desktopLogoff'),
diff --git a/vdsm/virt/Makefile.am b/vdsm/virt/Makefile.am
index 423839b..4b7b1cc 100644
--- a/vdsm/virt/Makefile.am
+++ b/vdsm/virt/Makefile.am
@@ -25,6 +25,7 @@
 	__init__.py \
 	guestagent.py \
 	migration.py \
+	nodedev.py \
 	sampling.py \
 	vm.py \
 	vmchannels.py \


-- 
To view, visit http://gerrit.ovirt.org/30209
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6f21d465a90cfe2eb16ba70943e5fcf1683f1656
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Martin Polednik <mpolednik(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011