diff --git a/virtManager/createnet.py b/virtManager/createnet.py index 3612dc56..d092d9d1 100644 --- a/virtManager/createnet.py +++ b/virtManager/createnet.py @@ -257,18 +257,12 @@ class vmmCreateNetwork(vmmGObjectUI): ################### def validate_name(self): - name_widget = self.widget("net-name") - name = name_widget.get_text() - if len(name) > 50 or len(name) == 0: - retcode = self.err.val_err(_("Invalid Network Name"), - _("Network name must be non-blank and less than " - "50 characters")) - name_widget.grab_focus() - return retcode - if re.match("^[a-zA-Z0-9_]*$", name) is None: - return self.err.val_err(_("Invalid Network Name"), - _("Network name may contain alphanumeric and '_' " - "characters only")) + try: + net = self._build_xmlstub() + net.name = self.widget("net-name").get_text() + except Exception, e: + return self.err.val_err(_("Invalid network name"), str(e)) + return True def validate_ipv4(self): @@ -684,8 +678,11 @@ class vmmCreateNetwork(vmmGObjectUI): # XML build and install # ######################### + def _build_xmlstub(self): + return Network(self.conn.get_backend()) + def _build_xmlobj(self): - net = Network(self.conn.get_backend()) + net = self._build_xmlstub() net.name = self.widget("net-name").get_text() net.domain_name = self.widget("net-domain-name").get_text() or None diff --git a/virtinst/network.py b/virtinst/network.py index 8925dc33..e2ffa120 100644 --- a/virtinst/network.py +++ b/virtinst/network.py @@ -131,7 +131,9 @@ class Network(XMLBuilder): # Validation helpers # ###################### - def _check_name_collision(self, name): + def _validate_name(self, name): + util.validate_name(_("Network"), name) + try: self.conn.networkLookupByName(name) except libvirt.libvirtError: @@ -155,7 +157,7 @@ class Network(XMLBuilder): "macaddr", "ips", "routes"] ipv6 = XMLProperty("./@ipv6", is_yesno=True) - name = XMLProperty("./name", validate_cb=_check_name_collision) + name = XMLProperty("./name", validate_cb=_validate_name) uuid = XMLProperty("./uuid", validate_cb=lambda s, v: util.validate_uuid(v), default_cb=_get_default_uuid)