Change in vdsm[master]: Rename guestIF{, Tests}.py to guestagent{, Tests}.py

vfeenstr at redhat.com vfeenstr at redhat.com
Fri Mar 28 12:42:54 UTC 2014


Vinzenz Feenstra has uploaded a new change for review.

Change subject: Rename guestIF{,Tests}.py to guestagent{,Tests}.py
......................................................................

Rename guestIF{,Tests}.py to guestagent{,Tests}.py

Change-Id: I9f3f2068dd8f61538d76687cbf0c55c85d8eeb6e
Signed-off-by: Vinzenz Feenstra <vfeenstr at redhat.com>
---
M debian/vdsm.install
M tests/Makefile.am
R tests/guestagentTests.py
M vdsm.spec.in
M vdsm/virt/Makefile.am
R vdsm/virt/guestagent.py
M vdsm/virt/vm.py
7 files changed, 22 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/26195/1

diff --git a/debian/vdsm.install b/debian/vdsm.install
index 633f8fb..87ba035 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -134,7 +134,7 @@
 ./usr/share/vdsm/vdsmDebugPlugin.py
 ./usr/share/vdsm/vdsmapi-schema.json
 ./usr/share/vdsm/virt/__init__.py
-./usr/share/vdsm/virt/guestIF.py
+./usr/share/vdsm/virt/guestagent.py
 ./usr/share/vdsm/virt/sampling.py
 ./usr/share/vdsm/virt/vm.py
 ./usr/share/vdsm/virt/vmchannels.py
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 37d1527..5ad5c0b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,7 @@
 	getAllVolumesTests.py \
 	gluster_cli_tests.py \
 	glusterTestData.py \
-	guestIFTests.py \
+	guestagentTests.py \
 	hooksTests.py \
 	ipwrapperTests.py \
 	iscsiTests.py \
diff --git a/tests/guestIFTests.py b/tests/guestagentTests.py
similarity index 86%
rename from tests/guestIFTests.py
rename to tests/guestagentTests.py
index 1a6e6d2..63badef 100644
--- a/tests/guestIFTests.py
+++ b/tests/guestagentTests.py
@@ -20,7 +20,7 @@
 #
 import logging
 from collections import namedtuple
-from virt import guestIF
+from virt import guestagent
 import json
 
 from testrunner import VdsmTestCase as TestCaseBase
@@ -85,32 +85,32 @@
 class TestGuestIF(TestCaseBase):
     def testfilterXmlChars(self):
         ALL_LEGAL = u"Hello World"
-        self.assertEqual(ALL_LEGAL, guestIF._filterXmlChars(ALL_LEGAL))
+        self.assertEqual(ALL_LEGAL, guestagent._filterXmlChars(ALL_LEGAL))
         TM = u"\u2122"
-        self.assertEqual(TM, guestIF._filterXmlChars(TM))
+        self.assertEqual(TM, guestagent._filterXmlChars(TM))
         invalid = u"\u0000"
-        self.assertEqual(u'\ufffd', guestIF._filterXmlChars(invalid))
+        self.assertEqual(u'\ufffd', guestagent._filterXmlChars(invalid))
         invalid2 = u"\uffff"
-        self.assertEqual(u'\ufffd',  guestIF._filterXmlChars(invalid2))
+        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid2))
         invalid3 = u"\ufffe"
-        self.assertEqual(u'\ufffd',  guestIF._filterXmlChars(invalid3))
+        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid3))
         invalid4 = u"\ud800"
-        self.assertEqual(u'\ufffd',  guestIF._filterXmlChars(invalid4))
+        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid4))
         invalid5 = u"\udc79"
-        self.assertEqual(u'\ufffd',  guestIF._filterXmlChars(invalid5))
+        self.assertEqual(u'\ufffd',  guestagent._filterXmlChars(invalid5))
 
     def test_filterObject(self):
         ILLEGAL_DATA = {u"foo": u"\x00data\x00test\uffff\ufffe\ud800\udc79"}
         LEGAL_DATA = {u"foo": u"?data?test\U00010000"}
         EXPECTED_DATA = {
             u"foo": u"\ufffddata\ufffdtest\ufffd\ufffd\ufffd\ufffd"}
-        self.assertEqual(EXPECTED_DATA, guestIF._filterObject(ILLEGAL_DATA))
-        self.assertEqual(LEGAL_DATA, guestIF._filterObject(LEGAL_DATA))
+        self.assertEqual(EXPECTED_DATA, guestagent._filterObject(ILLEGAL_DATA))
+        self.assertEqual(LEGAL_DATA, guestagent._filterObject(LEGAL_DATA))
 
     def test_handleMessage(self):
         logging.TRACE = 5
-        fakeGuestAgent = guestIF.GuestAgent(None,
-                                            None, self.log, connect=False)
+        fakeGuestAgent = guestagent.GuestAgent(None, None, self.log,
+                                               connect=False)
         testCase = namedtuple('testCase', 'msgType, message, assertDict')
 
         for t in zip(_MSG_TYPES, _INPUTS, _OUTPUTS):
@@ -129,8 +129,8 @@
     # perform general setup tasks
     def setUp(self):
         logging.TRACE = 5
-        self.fakeGuestAgent = guestIF.GuestAgent(None, None, self.log,
-                                                 connect=False)
+        self.fakeGuestAgent = guestagent.GuestAgent(None, None, self.log,
+                                                    connect=False)
         self.fakeGuestAgent.MAX_MESSAGE_SIZE = 100
         self.maxMessageSize = self.fakeGuestAgent.MAX_MESSAGE_SIZE
         self.fakeGuestAgent._clearReadBuffer()
@@ -179,11 +179,11 @@
                 self.fakeGuestAgent._handleData(chunk)
                 if chunk[-1] != '\n':
                     self.assertEqual(self.fakeGuestAgent._messageState,
-                                     guestIF.MessageState.TOO_BIG)
+                                     guestagent.MessageState.TOO_BIG)
 
             # At the end the message state has to be NORMAL again
             self.assertEqual(self.fakeGuestAgent._messageState,
-                             guestIF.MessageState.NORMAL)
+                             guestagent.MessageState.NORMAL)
 
             for (k, v) in t.assertDict.iteritems():
                 if isOverLimit:
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 031387e..ca3b5d0 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -932,7 +932,7 @@
 %{_datadir}/%{vdsm_name}/vdsm-restore-net-config
 %{_datadir}/%{vdsm_name}/vdsm-store-net-config
 %{_datadir}/%{vdsm_name}/virt/__init__.py*
-%{_datadir}/%{vdsm_name}/virt/guestIF.py*
+%{_datadir}/%{vdsm_name}/virt/guestagent.py*
 %{_datadir}/%{vdsm_name}/virt/vmchannels.py*
 %{_datadir}/%{vdsm_name}/virt/vmstatus.py*
 %{_datadir}/%{vdsm_name}/virt/vm.py*
diff --git a/vdsm/virt/Makefile.am b/vdsm/virt/Makefile.am
index 3fec972..52d546c 100644
--- a/vdsm/virt/Makefile.am
+++ b/vdsm/virt/Makefile.am
@@ -23,7 +23,7 @@
 vdsm_virtdir = $(vdsmdir)/virt
 dist_vdsm_virt_PYTHON = \
 	__init__.py \
-	guestIF.py \
+	guestagent.py \
 	sampling.py \
 	vm.py \
 	vmchannels.py \
diff --git a/vdsm/virt/guestIF.py b/vdsm/virt/guestagent.py
similarity index 100%
rename from vdsm/virt/guestIF.py
rename to vdsm/virt/guestagent.py
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index e15def1..a91ee99 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -58,7 +58,7 @@
 import supervdsm
 
 # local package imports
-from . import guestIF
+from . import guestagent
 from . import sampling
 from . import vmexitreason
 from . import vmstatus
@@ -3137,7 +3137,7 @@
         # VmStatsThread may use block devices info from libvirt.
         # So, run it after you have this info
         self._initVmStats()
-        self.guestAgent = guestIF.GuestAgent(
+        self.guestAgent = guestagent.GuestAgent(
             self._guestSocketFile, self.cif.channelListener, self.log,
             connect=utils.tobool(self.conf.get('vmchannel', 'true')))
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9f3f2068dd8f61538d76687cbf0c55c85d8eeb6e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Vinzenz Feenstra <vfeenstr at redhat.com>


More information about the vdsm-patches mailing list