Antoni Segura Puimedon has uploaded a new change for review.
Change subject: Do not allow empty bridge names
......................................................................
Do not allow empty bridge names
It was possible to create empty bridge names that ended up in
libvirt networks called 'vdsm-'. This patch solved it returning
the appropriate error.
Change-Id: I1d1e5d9fb284eb67936daf197e3025314a29f58b
Bug-Url:
https://bugzilla.redhat.com/1078899
Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com>
---
M tests/netmodelsTests.py
M vdsm/network/models.py
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/26263/1
diff --git a/tests/netmodelsTests.py b/tests/netmodelsTests.py
index 551c836..a2a3ee3 100644
--- a/tests/netmodelsTests.py
+++ b/tests/netmodelsTests.py
@@ -49,7 +49,7 @@
self.assertEqual(Vlan.validateTag(Vlan.MAX_ID), None)
def testIsBridgeNameValid(self):
- invalidBrName = ('-abc', 'abcdefghijklmnop', 'a:b',
'a.b')
+ invalidBrName = ('', '-abc', 'abcdefghijklmnop',
'a:b', 'a.b')
for i in invalidBrName:
with self.assertRaises(errors.ConfigNetworkError) as cneContext:
Bridge.validateName(i)
diff --git a/vdsm/network/models.py b/vdsm/network/models.py
index bce7802..ced0a30 100644
--- a/vdsm/network/models.py
+++ b/vdsm/network/models.py
@@ -165,7 +165,7 @@
@classmethod
def validateName(cls, name):
- if not (name and len(name) <= cls.MAX_NAME_LEN and
+ if not (name and 0 < len(name) <= cls.MAX_NAME_LEN and
len(set(name) & cls.ILLEGAL_CHARS) == 0 and
not name.startswith('-')):
raise ConfigNetworkError(ne.ERR_BAD_BRIDGE,
--
To view, visit
http://gerrit.ovirt.org/26263
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d1e5d9fb284eb67936daf197e3025314a29f58b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>