diff --git a/cm/parsers/Cisco/ASA/base.py b/cm/parsers/Cisco/ASA/base.py index 6520471efd7232852da1fcd84938d0b059253b5c..0d5144fb7e329c329dec01dcadf538c075ac1bc5 100644 --- a/cm/parsers/Cisco/ASA/base.py +++ b/cm/parsers/Cisco/ASA/base.py @@ -17,7 +17,7 @@ from noc.core.ip import IPv4 from noc.cm.parsers.pyparser import BasePyParser from noc.cm.parsers.tokens import INDENT, IPv4_ADDRESS, LINE, REST, DIGITS, ALPHANUMS from noc.core.text import ranges_to_list -from noc.lib.validators import is_ipv4, is_int +from noc.core.validators import is_ipv4, is_int class BaseASAParser(BasePyParser): diff --git a/cm/parsers/Cisco/IOS/base.py b/cm/parsers/Cisco/IOS/base.py index ee99f70015c2c8332a56463f705c6ffa1abaa8e7..716502665f159ec98a12236266377b4d67c25823 100644 --- a/cm/parsers/Cisco/IOS/base.py +++ b/cm/parsers/Cisco/IOS/base.py @@ -27,7 +27,7 @@ from noc.core.ip import IPv4 from noc.cm.parsers.pyparser import BasePyParser from noc.cm.parsers.tokens import INDENT, IPv4_ADDRESS, LINE, REST, DIGITS, ALPHANUMS, RD from noc.core.text import ranges_to_list -from noc.lib.validators import is_ipv4, is_int +from noc.core.validators import is_ipv4, is_int class BaseIOSParser(BasePyParser): diff --git a/cm/parsers/Cisco/IOSXR/base.py b/cm/parsers/Cisco/IOSXR/base.py index 30f96f65da76986d5e44d312a0d45c0a5f62f981..a8f7bef6724da885a5e1fc75b6d9bd4e3cdb4c51 100644 --- a/cm/parsers/Cisco/IOSXR/base.py +++ b/cm/parsers/Cisco/IOSXR/base.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Basic IOS XR parser # --------------------------------------------------------------------- -# Copyright (C) 2007-2015 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -14,7 +14,7 @@ from pyparsing import OneOrMore, Word, alphanums, QuotedString # NOC modules from noc.cm.parsers.base import BaseParser -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 class BaseIOSXRParser(BaseParser): diff --git a/cm/parsers/DLink/DxS/base.py b/cm/parsers/DLink/DxS/base.py index b6ad747e5514b508122ff3e3bcae61be5d9acc68..ad79adbbbfe8e80e963e663aa707d40eaaebd79d 100644 --- a/cm/parsers/DLink/DxS/base.py +++ b/cm/parsers/DLink/DxS/base.py @@ -16,7 +16,7 @@ from pyparsing import nums, Word, Group, Optional, Suppress, Combine, Literal, d # NOC modules from noc.cm.parsers.base import BaseParser from noc.core.ip import IPv4 -from noc.lib.validators import is_ipv4, is_int +from noc.core.validators import is_ipv4, is_int class BaseDLinkParser(BaseParser): diff --git a/cm/parsers/Huawei/VRP/base.py b/cm/parsers/Huawei/VRP/base.py index 096886948e2c5d53df5689dca3dd8b812ef87793..092b89f1a02cdcae13277fa5114fe14c391b7b53 100644 --- a/cm/parsers/Huawei/VRP/base.py +++ b/cm/parsers/Huawei/VRP/base.py @@ -13,7 +13,7 @@ from collections import defaultdict from noc.core.text import ranges_to_list from noc.cm.parsers.base import BaseParser from noc.core.ip import IPv4 -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class BaseVRPParser(BaseParser): diff --git a/commands/dnszone.py b/commands/dnszone.py index 35e363246d8b6d73b530feb0610ead240466fe87..3e061615115f149f8815fe5f5cbf25b2e6da0ae1 100644 --- a/commands/dnszone.py +++ b/commands/dnszone.py @@ -23,7 +23,7 @@ from noc.dns.models.dnszoneprofile import DNSZoneProfile from noc.ip.models.vrf import VRF from noc.ip.models.addressprofile import AddressProfile from noc.ip.models.address import Address -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.dns.utils.rr import RR from noc.core.text import split_alnum diff --git a/commands/events.py b/commands/events.py index 27b36fbfb7a2d874d66ada1debb7c9018f167d37..3d48645db7fe697ce26f4625977d29002fb29177 100644 --- a/commands/events.py +++ b/commands/events.py @@ -30,7 +30,7 @@ from noc.fm.models.activealarm import ActiveAlarm from noc.fm.models.archivedalarm import ArchivedAlarm from noc.fm.models.eventclass import EventClass from noc.fm.models.mib import MIB -from noc.lib.validators import is_oid +from noc.core.validators import is_oid from noc.core.escape import json_escape diff --git a/commands/l3-topology.py b/commands/l3-topology.py index 88227af093d1ec112eb298fef0bef99c6eae2c1e..bc812d50df5b076159817371b4191ec5e1b35351 100644 --- a/commands/l3-topology.py +++ b/commands/l3-topology.py @@ -21,7 +21,7 @@ from noc.sa.models.managedobject import ManagedObject from noc.inv.models.forwardinginstance import ForwardingInstance from noc.inv.models.subinterface import SubInterface from noc.core.ip import IP -from noc.lib.validators import is_rd +from noc.core.validators import is_rd class Command(BaseCommand): diff --git a/commands/ping.py b/commands/ping.py index f837cd92448b2a782dba3c108201586a930a900e..0d3f9d0bcec10b40f85064a56c4a21017b9bacfe 100755 --- a/commands/ping.py +++ b/commands/ping.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Pretty command # ---------------------------------------------------------------------- -# Copyright (C) 2007-2015 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -16,7 +16,7 @@ import tornado.queues # NOC modules from noc.core.management.base import BaseCommand -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 from noc.core.ioloop.ping import Ping from noc.config import config diff --git a/commands/script.py b/commands/script.py index 92f053cb9c242708e20be8a68683b0b2dd15e017..03b20e3e47d9ace22ef4a513e97926b3342e39c4 100644 --- a/commands/script.py +++ b/commands/script.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # ./noc script # ---------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -20,7 +20,7 @@ import yaml # NOC modules from noc.core.management.base import BaseCommand -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.span import get_spans, Span from noc.core.script.loader import loader from noc.core.script.beef import Beef diff --git a/commands/snmp.py b/commands/snmp.py index f08cc33d96a971d93be4a8c23bec6707b0b4450b..69be2d74aa09a944dc1561b5784e3d4c8cb9e8c2 100755 --- a/commands/snmp.py +++ b/commands/snmp.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Pretty command # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -16,7 +16,7 @@ import tornado.queues # NOC modules from noc.core.management.base import BaseCommand -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 from noc.core.ioloop.snmp import snmp_get, SNMPError from noc.sa.interfaces.base import MACAddressParameter from noc.core.backport.time import perf_counter diff --git a/commands/wipe.py b/commands/wipe.py index af4cd15566f251e7f4d2b2b1e60d875b55442aa6..1365b3a1b2d25866b95f964e3f9b50b313705685 100644 --- a/commands/wipe.py +++ b/commands/wipe.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # ./noc wipe # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -15,7 +15,7 @@ from contextlib import contextmanager # NOC modules from noc.core.management.base import BaseCommand, CommandError from noc.core.mongo.connection import connect -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.datastream.change import bulk_datastream_changes diff --git a/core/confdb/tokenizer/routeros.py b/core/confdb/tokenizer/routeros.py index 867e5f1bfdda7093217904937d3357e78025edda..b27cd85e4a603018e73f06056addc294e4d78ec9 100644 --- a/core/confdb/tokenizer/routeros.py +++ b/core/confdb/tokenizer/routeros.py @@ -11,7 +11,7 @@ from __future__ import absolute_import import re # NOC modules -from noc.lib.validators import is_int +from noc.core.validators import is_int from .line import LineTokenizer diff --git a/core/config/params.py b/core/config/params.py index 76310e1c43c063ef8059f26ccca96c700bb2caf5..f2a3f906cfd42202de69b0dcca8e9d82ba3c705f 100644 --- a/core/config/params.py +++ b/core/config/params.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Config parameters # ---------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -14,7 +14,7 @@ import logging import six # NOC modules -from noc.lib.validators import is_int, is_ipv4 +from noc.core.validators import is_int, is_ipv4 logger = logging.getLogger(__name__) diff --git a/core/etl/loader/managedobject.py b/core/etl/loader/managedobject.py index 02373f4d3279dc9a5a3403ce1481545360851c55..7dc6908674c69b4658794502149c7380eda00f9e 100644 --- a/core/etl/loader/managedobject.py +++ b/core/etl/loader/managedobject.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Managed Object loader # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -14,7 +14,7 @@ from noc.main.models.pool import Pool from noc.sa.models.managedobject import ManagedObject from noc.sa.models.profile import Profile from .base import BaseLoader -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class ManagedObjectLoader(BaseLoader): diff --git a/core/http/client.py b/core/http/client.py index c5fe7c789ed188f8a911a473dd846276343b4e4e..df1600f436dc84e097567b476b0c2961c633ac74 100644 --- a/core/http/client.py +++ b/core/http/client.py @@ -27,7 +27,7 @@ import ujson # NOC modules from noc.core.perf import metrics -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 from .proxy import SYSTEM_PROXIES from noc.config import config diff --git a/core/ioloop/whois.py b/core/ioloop/whois.py index 10b4b2cbdffdcfe1415704c3c2ea2d2895ac55f3..d5fc689ff88a449d7d5b430bda28a492e54b3355 100644 --- a/core/ioloop/whois.py +++ b/core/ioloop/whois.py @@ -15,7 +15,7 @@ import tornado.gen import tornado.ioloop # NOC modules -from noc.lib.validators import is_fqdn +from noc.core.validators import is_fqdn DEFAULT_WHOIS_SERVER = "whois.ripe.net" DEFAULT_WHOIS_PORT = 43 diff --git a/core/ip.py b/core/ip.py index 51de5f2f0ffa79d3fc5f69a61604fa534bb634be..6535315ec15ff8cfa04b3222835c960b8c77911a 100644 --- a/core/ip.py +++ b/core/ip.py @@ -14,7 +14,7 @@ import struct import six # NOC Modules -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix # Bit masks B16 = 0xFFFF diff --git a/core/script/base.py b/core/script/base.py index 6416ce2744257a5f61de5cec6091cdd13ba7553d..8e64af4ec286d72dd761c8892b07e5aafba6342b 100644 --- a/core/script/base.py +++ b/core/script/base.py @@ -21,7 +21,7 @@ from six.moves import zip # NOC modules from noc.core.log import PrefixLoggerAdapter -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.profile.loader import loader as profile_loader from noc.core.handler import get_handler from noc.core.mac import MAC diff --git a/lib/validators.py b/core/validators.py similarity index 100% rename from lib/validators.py rename to core/validators.py diff --git a/core/vlan.py b/core/vlan.py index 635a4aef86601161473cf4b4024cab20f73b6de7..38423d64ae350f02a1ea7a4d1f05953ea8eb10ca 100644 --- a/core/vlan.py +++ b/core/vlan.py @@ -13,7 +13,7 @@ import re import six # NOC modules -from noc.lib.validators import is_vlan +from noc.core.validators import is_vlan rx_range = re.compile(r"^(\d+)\s*-\s*(\d+)$") diff --git a/dns/models/dnszone.py b/dns/models/dnszone.py index 7052fea7e48a21b42e503e9e3d2dd84e54ae98f2..a2df799a5a081a73b68d6edcf78d74485ed98660 100644 --- a/dns/models/dnszone.py +++ b/dns/models/dnszone.py @@ -29,7 +29,7 @@ from noc.main.models.systemnotification import SystemNotification from noc.project.models.project import Project from noc.core.model.fields import TagsField from noc.core.ip import IPv6 -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 from noc.core.rpsl import rpsl_format from noc.core.gridvcs.manager import GridVCSField from noc.core.datastream.decorator import datastream diff --git a/fm/models/mib.py b/fm/models/mib.py index 97d87079080ea63a7032e3f5392755a9b56b87e4..9018ba48fa14a540616d74c8b49417d57034664d 100644 --- a/fm/models/mib.py +++ b/fm/models/mib.py @@ -19,7 +19,7 @@ from mongoengine.fields import StringField, DateTimeField, IntField, ListField, import cachetools # NOC modules -from noc.lib.validators import is_oid +from noc.core.validators import is_oid from noc.core.escape import fm_unescape, fm_escape from noc.core.snmp.util import render_tc from noc.core.model.decorator import on_delete_check diff --git a/ip/models/address.py b/ip/models/address.py index f2af0bcb158992713257da7b566edb1a7f3a06ed..1df7689d3b8d6ead771cf0ef616b8e295df69eef 100644 --- a/ip/models/address.py +++ b/ip/models/address.py @@ -21,7 +21,7 @@ from noc.core.model.base import NOCModel from noc.project.models.project import Project from noc.sa.models.managedobject import ManagedObject from noc.core.model.fields import TagsField, INETField, MACField -from noc.lib.validators import ValidationError, check_fqdn, check_ipv4, check_ipv6 +from noc.core.validators import ValidationError, check_fqdn, check_ipv4, check_ipv6 from noc.main.models.textindex import full_text_search from noc.core.model.fields import DocumentReferenceField from noc.core.wf.decorator import workflow diff --git a/ip/models/addressrange.py b/ip/models/addressrange.py index ef675a6779063db655a97948db5158d3fbf1f68b..8a34e6697150c6a78443f893468a1bfc10609e82 100644 --- a/ip/models/addressrange.py +++ b/ip/models/addressrange.py @@ -20,7 +20,7 @@ from noc.core.model.base import NOCModel from noc.config import config from noc.core.model.fields import TagsField, CIDRField from noc.core.ip import IP -from noc.lib.validators import check_ipv4, check_ipv6 +from noc.core.validators import check_ipv4, check_ipv6 from noc.core.datastream.decorator import datastream from .afi import AFI_CHOICES from .vrf import VRF diff --git a/ip/models/prefix.py b/ip/models/prefix.py index e63ee6a6889bedf77954a9ca70852a5bdd9b686d..9eb28c792dc27527a80cbedb3c6e37ae765a530f 100644 --- a/ip/models/prefix.py +++ b/ip/models/prefix.py @@ -25,7 +25,7 @@ from noc.peer.models.asn import AS from noc.vc.models.vc import VC from noc.core.model.fields import TagsField, CIDRField, DocumentReferenceField, CachedForeignKey from noc.lib.app.site import site -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError from noc.core.ip import IP, IPv4 from noc.main.models.textindex import full_text_search from noc.core.translation import ugettext as _ diff --git a/ip/models/prefixaccess.py b/ip/models/prefixaccess.py index c1f3f02ce0c7789ea3c2a6c0cc1d322697c541e3..4132042dd2f0d12eb4544080ed766394c8d239d9 100644 --- a/ip/models/prefixaccess.py +++ b/ip/models/prefixaccess.py @@ -21,7 +21,7 @@ from django.db.models import Q from noc.core.model.base import NOCModel from noc.aaa.models.user import User from noc.core.model.fields import CIDRField -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix from noc.core.model.sql import SQL from .afi import AFI_CHOICES from .vrf import VRF diff --git a/ip/models/vrf.py b/ip/models/vrf.py index 87763b5e596ee2998b8d2bccab79e1964447e4e6..4233db03f731267da72a042c2258bcf0945a3acb 100644 --- a/ip/models/vrf.py +++ b/ip/models/vrf.py @@ -20,7 +20,7 @@ import cachetools # NOC modules from noc.core.model.base import NOCModel from noc.project.models.project import Project -from noc.lib.validators import check_rd +from noc.core.validators import check_rd from noc.core.model.fields import TagsField, DocumentReferenceField from noc.lib.app.site import site from noc.main.models.textindex import full_text_search diff --git a/lib/app/docinline.py b/lib/app/docinline.py index 0aeae9c382e9c8ad306ea77678cccb880146f801..eb23a5fb9bac21d0346f4cee64e2a8613eb57b41 100644 --- a/lib/app/docinline.py +++ b/lib/app/docinline.py @@ -23,7 +23,7 @@ from noc.sa.interfaces.base import ( InterfaceTypeError, DocumentParameter, ) -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.mongo.fields import PlainReferenceField, ForeignKeyField diff --git a/lib/app/extdocapplication.py b/lib/app/extdocapplication.py index 5c7f3bc99129166b8a76beec672bef83d701b510..89f1c724751a9ef4e00b8e31184f3e7215333d86 100644 --- a/lib/app/extdocapplication.py +++ b/lib/app/extdocapplication.py @@ -42,7 +42,7 @@ from noc.sa.interfaces.base import ( DocumentParameter, ObjectIdParameter, ) -from noc.lib.validators import is_int, is_uuid +from noc.core.validators import is_int, is_uuid from noc.aaa.models.permission import Permission from noc.core.middleware.tls import get_user from noc.main.models.doccategory import DocCategory diff --git a/lib/app/extmodelapplication.py b/lib/app/extmodelapplication.py index f1d48ca69a363b45b0a1987a0b7176f79ccd9f18..5512e7884eff09d3340bf36f435234c44949a6a2 100644 --- a/lib/app/extmodelapplication.py +++ b/lib/app/extmodelapplication.py @@ -41,7 +41,7 @@ from noc.sa.interfaces.base import ( ModelParameter, InterfaceTypeError, ) -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.models import is_document from noc.main.models.tag import Tag from noc.core.stencil import stencil_registry diff --git a/lib/app/modelinline.py b/lib/app/modelinline.py index 1d2903ac18bb53bca587b3a94a962b5ea193e260..b5ca82abb52e2371747c4f9551d38025fd9dba77 100644 --- a/lib/app/modelinline.py +++ b/lib/app/modelinline.py @@ -25,7 +25,7 @@ from noc.sa.interfaces.base import ( StringListParameter, NoneParameter, ) -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.model.fields import TextArrayField diff --git a/main/models/customfield.py b/main/models/customfield.py index bccda894328d71617edb27c533a35c976794196c..a755e5bcc33776d1ffbe3c9c3f7287cd0cd6c9c5 100644 --- a/main/models/customfield.py +++ b/main/models/customfield.py @@ -23,7 +23,7 @@ import mongoengine.signals # NOC modules from noc.core.model.base import NOCModel -from noc.lib.validators import is_int +from noc.core.validators import is_int from .customfieldenumgroup import CustomFieldEnumGroup logger = logging.getLogger(__name__) diff --git a/main/models/mimetype.py b/main/models/mimetype.py index b0ebb789fc982897eb2b7d633e49860b87c459ed..51344a2d302bf2622c32e4d1ad2df387cec9412b 100644 --- a/main/models/mimetype.py +++ b/main/models/mimetype.py @@ -15,7 +15,7 @@ from django.db import models # NOC modules from noc.core.model.base import NOCModel -from noc.lib.validators import check_extension, check_mimetype +from noc.core.validators import check_extension, check_mimetype @six.python_2_unicode_compatible diff --git a/peer/models/whoiscache.py b/peer/models/whoiscache.py index e0e025da5a5ff19f61fbcef716a6e416bc446dc3..8a6efade89561ea275d5d6485a5a9d03e51e1c79 100644 --- a/peer/models/whoiscache.py +++ b/peer/models/whoiscache.py @@ -8,7 +8,7 @@ # NOC modules from noc.config import config -from noc.lib.validators import is_asn +from noc.core.validators import is_asn from noc.core.ip import IP from noc.core.prefixlist import optimize_prefix_list, optimize_prefix_list_maxlen from noc.core.mongo.connection import get_db diff --git a/sa/interfaces/base.py b/sa/interfaces/base.py index 306b2143093649ca22574f7a9d0e4ea46e59fe82..8baa047695338b5adf981dd108aefcd5b521f493 100644 --- a/sa/interfaces/base.py +++ b/sa/interfaces/base.py @@ -17,7 +17,7 @@ import six from noc.core.text import list_to_ranges, ranges_to_list from noc.core.ip import IPv6 from noc.core.mac import MAC -from noc.lib.validators import is_ipv6 +from noc.core.validators import is_ipv6 from noc.core.interface.error import InterfaceTypeError from noc.core.interface.parameter import BaseParameter as Parameter from noc.core.interface.parameter import ORParameter # noqa diff --git a/sa/migrations/0189_managedobject_fill_fqdn.py b/sa/migrations/0189_managedobject_fill_fqdn.py index e1402e87ca0d2675ce457ab8dd3ecce6d4b68f29..049abbac92d715068af9dc6bf2e0179f95bf05f6 100644 --- a/sa/migrations/0189_managedobject_fill_fqdn.py +++ b/sa/migrations/0189_managedobject_fill_fqdn.py @@ -8,7 +8,7 @@ # NOC modules from noc.core.migration.base import BaseMigration -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 class Migration(BaseMigration): diff --git a/sa/models/managedobject.py b/sa/models/managedobject.py index 6c39d442f4ac4e300e606b8d123365d8c76b3c5c..be8f94a89433359ed104fd9076d8b7285aa0e548 100644 --- a/sa/models/managedobject.py +++ b/sa/models/managedobject.py @@ -58,7 +58,7 @@ from noc.core.model.fields import ( from noc.core.model.sql import SQL from noc.lib.app.site import site from noc.core.stencil import stencil_registry -from noc.lib.validators import is_ipv4, is_ipv4_prefix +from noc.core.validators import is_ipv4, is_ipv4_prefix from noc.core.ip import IP from noc.sa.interfaces.base import MACAddressParameter from noc.core.gridvcs.manager import GridVCSField diff --git a/sa/models/managedobjectselector.py b/sa/models/managedobjectselector.py index 2acfa321a222dec2fd613e45834d80114d9fcdf7..b08e306d9fdb64ccceacfc05407beac4623b741e 100644 --- a/sa/models/managedobjectselector.py +++ b/sa/models/managedobjectselector.py @@ -29,7 +29,7 @@ from noc.fm.models.ttsystem import TTSystem from noc.main.models.pool import Pool from noc.main.models.prefixtable import PrefixTable from noc.core.model.fields import TagsField -from noc.lib.validators import check_re, is_int, is_ipv4, is_ipv6 +from noc.core.validators import check_re, is_int, is_ipv4, is_ipv6 from noc.core.model.sql import SQL from noc.core.model.decorator import on_delete, on_save, on_delete_check from noc.core.model.fields import DocumentReferenceField diff --git a/sa/profiles/3Com/SuperStack3/get_interfaces.py b/sa/profiles/3Com/SuperStack3/get_interfaces.py index 1a17a22ba35238d1144ffe185e3270d5b49de161..e8599199d0c5418f4c0922774e2ddba5abf337af 100644 --- a/sa/profiles/3Com/SuperStack3/get_interfaces.py +++ b/sa/profiles/3Com/SuperStack3/get_interfaces.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # 3Com.SuperStack3.get_interfaces # ---------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/3Com/SuperStack3/profile.py b/sa/profiles/3Com/SuperStack3/profile.py index 92eeb61383bc79adca669a6a62c3bc9c17879d17..3fae3442060c89a6b145091e9291bccf5ec1c4eb 100644 --- a/sa/profiles/3Com/SuperStack3/profile.py +++ b/sa/profiles/3Com/SuperStack3/profile.py @@ -3,7 +3,7 @@ # Vendor: 3Com # OS: SuperStack3 # ---------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -11,7 +11,7 @@ import re # NOC modules from noc.core.profile.base import BaseProfile -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/3Com/SuperStack3_4400/get_interfaces.py b/sa/profiles/3Com/SuperStack3_4400/get_interfaces.py index 0beb4514eb345acb3a736d6f2adb144079c2b4ba..b5f1c3587d1b101c0bdec195da97850cd27c132f 100644 --- a/sa/profiles/3Com/SuperStack3_4400/get_interfaces.py +++ b/sa/profiles/3Com/SuperStack3_4400/get_interfaces.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # 3Com.SuperStack3_4400.get_interfaces # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/3Com/SuperStack3_4400/profile.py b/sa/profiles/3Com/SuperStack3_4400/profile.py index 1a11acf1ee8d69cce7981a5c713d90c7eafe5876..f1df21f766440a756a58a428521b070afed896d4 100644 --- a/sa/profiles/3Com/SuperStack3_4400/profile.py +++ b/sa/profiles/3Com/SuperStack3_4400/profile.py @@ -3,7 +3,7 @@ # Vendor: 3Com # OS: SuperStack3_4400 # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -11,7 +11,7 @@ import re # NOC modules from noc.core.profile.base import BaseProfile -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/Alcatel/OS62xx/get_lldp_neighbors.py b/sa/profiles/Alcatel/OS62xx/get_lldp_neighbors.py index a4bccf08a4ad61f1034836f1c3cec43b15e2e66f..1270f876734c5d2f0f66a6cb321d2f50a507587d 100644 --- a/sa/profiles/Alcatel/OS62xx/get_lldp_neighbors.py +++ b/sa/profiles/Alcatel/OS62xx/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/Alcatel/TIMOS/get_interfaces.py b/sa/profiles/Alcatel/TIMOS/get_interfaces.py index ed9b120a64e43e111db0fdd3950e46838943dfde..f45887ac66f1afeed879f992ab70583eafb9d025 100644 --- a/sa/profiles/Alcatel/TIMOS/get_interfaces.py +++ b/sa/profiles/Alcatel/TIMOS/get_interfaces.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Alcatel.TIMOS.get_interfaces # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_int, is_ipv6 +from noc.core.validators import is_int, is_ipv6 class Script(BaseScript): diff --git a/sa/profiles/AlliedTelesis/AT8000S/get_lldp_neighbors.py b/sa/profiles/AlliedTelesis/AT8000S/get_lldp_neighbors.py index 2d05702efa428c85b2db23259a922c32c14cc732..32919b89f51cb338a3a2b894118deae955b5c9a6 100644 --- a/sa/profiles/AlliedTelesis/AT8000S/get_lldp_neighbors.py +++ b/sa/profiles/AlliedTelesis/AT8000S/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/Alstec/24xx/get_lldp_neighbors.py b/sa/profiles/Alstec/24xx/get_lldp_neighbors.py index 52a402afe81b8d1de552a3042db03558f6fef22e..2a89c150d86cdfc0afe95bb8f9ad6f8cebfd6129 100644 --- a/sa/profiles/Alstec/24xx/get_lldp_neighbors.py +++ b/sa/profiles/Alstec/24xx/get_lldp_neighbors.py @@ -14,7 +14,7 @@ from noc.core.script.base import BaseScript from noc.core.text import parse_table from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 class Script(BaseScript): diff --git a/sa/profiles/Alstec/ALS/get_lldp_neighbors.py b/sa/profiles/Alstec/ALS/get_lldp_neighbors.py index 2dbd68ad40aed3e97728784088fa529b6da86da2..6c6aab7c3e1d25dc9dd4de88e3207c228d78628c 100644 --- a/sa/profiles/Alstec/ALS/get_lldp_neighbors.py +++ b/sa/profiles/Alstec/ALS/get_lldp_neighbors.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 from noc.core.text import parse_table diff --git a/sa/profiles/Alstec/ALS/ping.py b/sa/profiles/Alstec/ALS/ping.py index 737ff816800aedde3f098ebf3d1431a184ead0f8..487a8e80857a02f089b5827761d8692831eda425 100644 --- a/sa/profiles/Alstec/ALS/ping.py +++ b/sa/profiles/Alstec/ALS/ping.py @@ -2,15 +2,17 @@ # --------------------------------------------------------------------- # Alstec.ALS.ping # --------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- -""" -""" + +# Python modules +import re + +# NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 -import re +from noc.core.validators import is_ipv4, is_ipv6 class Script(BaseScript): diff --git a/sa/profiles/Angtel/Topaz/get_lldp_neighbors.py b/sa/profiles/Angtel/Topaz/get_lldp_neighbors.py index b8f45649b3cc8658d2053bd4c3f494651e80b53c..93521b344cd4011189ccbccb6184eb2bae573fb2 100644 --- a/sa/profiles/Angtel/Topaz/get_lldp_neighbors.py +++ b/sa/profiles/Angtel/Topaz/get_lldp_neighbors.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.core.text import parse_table from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.lldp import ( LLDP_CHASSIS_SUBTYPE_MAC, LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS, diff --git a/sa/profiles/Angtel/Topaz/ping.py b/sa/profiles/Angtel/Topaz/ping.py index e02603d55c3dcbbe293dae8032043d14eedb7c48..693b24c807428b90c61d877355a11bb3a28adafb 100644 --- a/sa/profiles/Angtel/Topaz/ping.py +++ b/sa/profiles/Angtel/Topaz/ping.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 class Script(BaseScript): diff --git a/sa/profiles/Axis/VAPIX/get_interfaces.py b/sa/profiles/Axis/VAPIX/get_interfaces.py index 1a4d2f9a98aad7dd5a361f07c41894e7363b70c3..ec5bf33f21d0f40be41b7781d21b22acf2ae665a 100644 --- a/sa/profiles/Axis/VAPIX/get_interfaces.py +++ b/sa/profiles/Axis/VAPIX/get_interfaces.py @@ -10,7 +10,7 @@ from noc.sa.profiles.Generic.get_interfaces import Script as BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/BDCOM/xPON/get_interfaces.py b/sa/profiles/BDCOM/xPON/get_interfaces.py index 7dc6778c35a87eb54982a2ecb4a4edf2c1d93733..a195e7539b7db802ca6eace5041d9156f20c4fb2 100644 --- a/sa/profiles/BDCOM/xPON/get_interfaces.py +++ b/sa/profiles/BDCOM/xPON/get_interfaces.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.text import parse_table -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/BDCOM/xPON/get_lldp_neighbors.py b/sa/profiles/BDCOM/xPON/get_lldp_neighbors.py index db5aa131b5e3d032814f1aa117b2360acb909b5a..0aa84b66d66fb4199e8f49144dd66b14d588eb90 100644 --- a/sa/profiles/BDCOM/xPON/get_lldp_neighbors.py +++ b/sa/profiles/BDCOM/xPON/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.lldp import ( LLDP_CHASSIS_SUBTYPE_MAC, LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS, diff --git a/sa/profiles/Carelink/SWG/get_interfaces.py b/sa/profiles/Carelink/SWG/get_interfaces.py index 015278a6d1f9155e7911852b89b218b93654d94d..8b5cf0ca86fbe2f5282c6d3b97fd72222f5eb6d0 100644 --- a/sa/profiles/Carelink/SWG/get_interfaces.py +++ b/sa/profiles/Carelink/SWG/get_interfaces.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.text import parse_table diff --git a/sa/profiles/Carelink/SWG/get_lldp_neighbors.py b/sa/profiles/Carelink/SWG/get_lldp_neighbors.py index 441c93644a3f9c7d35065a5f50d707dc0254d693..2b1114ab574c0ce376aafe27cab96a4d4a385c12 100644 --- a/sa/profiles/Carelink/SWG/get_lldp_neighbors.py +++ b/sa/profiles/Carelink/SWG/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac class Script(BaseScript): diff --git a/sa/profiles/Carelink/SWG/get_vlans.py b/sa/profiles/Carelink/SWG/get_vlans.py index 89f37f6e9f24218656f9230dc172945eccc4d714..929b788fa600b2475822a91e48de566e750284a7 100644 --- a/sa/profiles/Carelink/SWG/get_vlans.py +++ b/sa/profiles/Carelink/SWG/get_vlans.py @@ -9,7 +9,7 @@ # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetvlans import IGetVlans -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.text import parse_table diff --git a/sa/profiles/Cisco/IOS/get_capabilities.py b/sa/profiles/Cisco/IOS/get_capabilities.py index cffb356eb621e9ab2501f708ff16878daf0feee9..7fd31880e77af3cd39f54daebf6f0c8d8d6e463c 100644 --- a/sa/profiles/Cisco/IOS/get_capabilities.py +++ b/sa/profiles/Cisco/IOS/get_capabilities.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Cisco.IOS.get_capabilities_ex # --------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re from noc.sa.profiles.Generic.get_capabilities import Script as BaseScript from noc.sa.profiles.Generic.get_capabilities import false_on_cli_error from noc.core.mib import mib -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Cisco/IOS/get_inventory.py b/sa/profiles/Cisco/IOS/get_inventory.py index 29b4aaf2134cf0f3a82ee7e5678bfea1ed206b33..251a102b4cdb213cfb4787dbda77c9ebf6c9004f 100644 --- a/sa/profiles/Cisco/IOS/get_inventory.py +++ b/sa/profiles/Cisco/IOS/get_inventory.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Cisco.IOS.get_inventory # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ from itertools import groupby # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinventory import IGetInventory -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Cisco/IOS/get_lldp_neighbors.py b/sa/profiles/Cisco/IOS/get_lldp_neighbors.py index 769cdee0df1cda4b2c7093959eaf83e52994a107..91337a9557abe6470b0133f60a6f43b5bc6ea71c 100644 --- a/sa/profiles/Cisco/IOS/get_lldp_neighbors.py +++ b/sa/profiles/Cisco/IOS/get_lldp_neighbors.py @@ -13,7 +13,7 @@ import re from noc.sa.profiles.Generic.get_lldp_neighbors import Script as BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter, IPv4Parameter -from noc.lib.validators import is_int, is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_int, is_ipv4, is_ipv6, is_mac class Script(BaseScript): diff --git a/sa/profiles/Cisco/IOS/get_mac_address_table.py b/sa/profiles/Cisco/IOS/get_mac_address_table.py index caef50224cd922a2d70a3042e0bea5c90dd11ea3..58f0ed7dde802cec848d51ce95f96c28c2531d0d 100644 --- a/sa/profiles/Cisco/IOS/get_mac_address_table.py +++ b/sa/profiles/Cisco/IOS/get_mac_address_table.py @@ -10,7 +10,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetmacaddresstable import IGetMACAddressTable -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Cisco/IOSXR/get_lldp_neighbors.py b/sa/profiles/Cisco/IOSXR/get_lldp_neighbors.py index 18fa68a2a7d209212389a97041cf119880d92adc..9ec20cd8f0beb8a299740bd3e51785255d15eed7 100644 --- a/sa/profiles/Cisco/IOSXR/get_lldp_neighbors.py +++ b/sa/profiles/Cisco/IOSXR/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Cisco.IOSXR.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors, MACAddressParameter -from noc.lib.validators import is_int, is_ipv4 +from noc.core.validators import is_int, is_ipv4 class Script(BaseScript): diff --git a/sa/profiles/Cisco/NXOS/get_interfaces.py b/sa/profiles/Cisco/NXOS/get_interfaces.py index 454c6fa40f79b6b23f90f4d41d95e828e44ae8f6..faee4717a03062d53d31c110a6e5d29a1e231600 100644 --- a/sa/profiles/Cisco/NXOS/get_interfaces.py +++ b/sa/profiles/Cisco/NXOS/get_interfaces.py @@ -19,7 +19,7 @@ from six import StringIO from noc.core.script.base import BaseScript from noc.sa.interfaces.base import InterfaceTypeError from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Cisco/NXOS/get_lldp_neighbors.py b/sa/profiles/Cisco/NXOS/get_lldp_neighbors.py index c9c7c3946d2e2c7149dddd34c51c27bd009733b5..936417a12484e13e61a4006a57e7133872481f3d 100644 --- a/sa/profiles/Cisco/NXOS/get_lldp_neighbors.py +++ b/sa/profiles/Cisco/NXOS/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Cisco.NXOS.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_int, is_ipv4 +from noc.core.validators import is_int, is_ipv4 class Script(BaseScript): diff --git a/sa/profiles/Cisco/SMB/get_lldp_neighbors.py b/sa/profiles/Cisco/SMB/get_lldp_neighbors.py index b45c3dfc75d4f080cf5b6960425fec7f4fcabbc7..dc0855031c847cf428890c390a0f42f8ff5abab5 100644 --- a/sa/profiles/Cisco/SMB/get_lldp_neighbors.py +++ b/sa/profiles/Cisco/SMB/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_int, is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_int, is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/Cisco/SMB/get_switchport.py b/sa/profiles/Cisco/SMB/get_switchport.py index 97a658913d9f4f2f954bc5e72664d20779a824cc..1cc7acb603d3505efbc489ae431cdc4234410294 100644 --- a/sa/profiles/Cisco/SMB/get_switchport.py +++ b/sa/profiles/Cisco/SMB/get_switchport.py @@ -13,7 +13,7 @@ from time import sleep # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetswitchport import IGetSwitchport -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): @@ -111,12 +111,12 @@ class Script(BaseScript): if amode in ("trunk", "general"): is_trunk = True is_qnq = False - elif amode in ("access"): + elif amode in "access": if "avlan" in match.groups(): untagged = match.group("avlan") is_trunk = False is_qnq = False - elif amode in ("customer"): + elif amode in "customer": is_qnq = True is_trunk = True @@ -132,7 +132,7 @@ class Script(BaseScript): if match: vid = int(match.group("vid")) erule = match.group("erule").lower() - if erule in ("tagged"): + if erule in "tagged": tagged.append(vid) iface = { diff --git a/sa/profiles/DCN/DCWL/get_metrics.py b/sa/profiles/DCN/DCWL/get_metrics.py index e8aee475376471429eca0a3354e5b47ce5e9b96a..27de377c1c7e1bb638873acf7bf37dc23e911730 100644 --- a/sa/profiles/DCN/DCWL/get_metrics.py +++ b/sa/profiles/DCN/DCWL/get_metrics.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # DCN.DCWL.get_metrics # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -13,7 +13,7 @@ from collections import defaultdict # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class Script(GetMetricsScript): diff --git a/sa/profiles/DLink/DxS/get_chassis_id.py b/sa/profiles/DLink/DxS/get_chassis_id.py index 40b27069429bdb7df8107886bf3d235399a0f457..ecae9e90a1a42cb73fc564bd50a80cac11256712 100644 --- a/sa/profiles/DLink/DxS/get_chassis_id.py +++ b/sa/profiles/DLink/DxS/get_chassis_id.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.sa.profiles.Generic.get_chassis_id import Script as BaseScript from noc.sa.interfaces.igetchassisid import IGetChassisID -from noc.lib.validators import is_mac +from noc.core.validators import is_mac from noc.core.text import parse_table from noc.core.mib import mib diff --git a/sa/profiles/DLink/DxS/get_interfaces.py b/sa/profiles/DLink/DxS/get_interfaces.py index 61f76d7ee1019212957fc4da8aebf06159c5e337..cea917b4b529aa874e92f48092d9db90d05af995 100644 --- a/sa/profiles/DLink/DxS/get_interfaces.py +++ b/sa/profiles/DLink/DxS/get_interfaces.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.sa.profiles.DLink.DxS.profile import DxS_L2, DGS3120, DGS3420, DGS3620 from noc.core.mib import mib from noc.core.mac import MAC diff --git a/sa/profiles/Eltex/DSLAM/get_interfaces.py b/sa/profiles/Eltex/DSLAM/get_interfaces.py index 96d3da7dab82eb3e0ec79add2e1d29028a018cae..5b57cafba1df28ed149f87664aa89f32793b6318 100644 --- a/sa/profiles/Eltex/DSLAM/get_interfaces.py +++ b/sa/profiles/Eltex/DSLAM/get_interfaces.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.ip import IPv4 diff --git a/sa/profiles/Eltex/LTP/get_license.py b/sa/profiles/Eltex/LTP/get_license.py index 687de7f9a291c05c80131b52f391a3e018f8b530..e167ab662dc8586893d997dc89927a08307d6df3 100644 --- a/sa/profiles/Eltex/LTP/get_license.py +++ b/sa/profiles/Eltex/LTP/get_license.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Eltex.LTP.get_license # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlicense import IGetLicense -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Eltex/LTP/get_lldp_neighbors.py b/sa/profiles/Eltex/LTP/get_lldp_neighbors.py index b900a798192e2686b2537fe46218737aa444d1aa..21537e6f85c4d506e73a970785dae43d3f7bd97b 100644 --- a/sa/profiles/Eltex/LTP/get_lldp_neighbors.py +++ b/sa/profiles/Eltex/LTP/get_lldp_neighbors.py @@ -13,7 +13,7 @@ import re from noc.sa.profiles.Generic.get_lldp_neighbors import Script as BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_int, is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_int, is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/Eltex/MA4000/get_lldp_neighbors.py b/sa/profiles/Eltex/MA4000/get_lldp_neighbors.py index c96dfb459ad0ae5578dbd960b8c448885e6aaa5b..82b57ab9a85fcc1b708a6b9815278d9d080ed32f 100644 --- a/sa/profiles/Eltex/MA4000/get_lldp_neighbors.py +++ b/sa/profiles/Eltex/MA4000/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table from noc.core.lldp import ( LLDP_CHASSIS_SUBTYPE_MAC, diff --git a/sa/profiles/Eltex/MES/get_inventory.py b/sa/profiles/Eltex/MES/get_inventory.py index d06c95a83faa2a5a7b3462c18000f1437acd268c..2f64f9c7464505304e297119e8fb1fec281ada4d 100644 --- a/sa/profiles/Eltex/MES/get_inventory.py +++ b/sa/profiles/Eltex/MES/get_inventory.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinventory import IGetInventory from noc.core.text import parse_table -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Eltex/MES/get_lldp_neighbors.py b/sa/profiles/Eltex/MES/get_lldp_neighbors.py index 49bcb986fc8d1e406b92fa0c963bcbebeae71658..98058c541d60113855750dad69bef220443cf711 100644 --- a/sa/profiles/Eltex/MES/get_lldp_neighbors.py +++ b/sa/profiles/Eltex/MES/get_lldp_neighbors.py @@ -17,7 +17,7 @@ from six.moves import zip from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_int, is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_int, is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table from noc.core.mac import MAC from noc.core.mib import mib diff --git a/sa/profiles/Eltex/MES/profile.py b/sa/profiles/Eltex/MES/profile.py index bd81edd285b75579e798e3177e896c3b3dd29d18..6a027a3b781c39650d3df136778f7c65d887d16c 100644 --- a/sa/profiles/Eltex/MES/profile.py +++ b/sa/profiles/Eltex/MES/profile.py @@ -13,7 +13,7 @@ import re # NOC modules from noc.core.profile.base import BaseProfile from noc.sa.interfaces.base import InterfaceTypeError -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/Eltex/WOP/get_metrics.py b/sa/profiles/Eltex/WOP/get_metrics.py index 6d56dee3f2351a558032b2d37a01d00cca92df38..c5860840b35371dbc224acff62f8b236f20b36ab 100644 --- a/sa/profiles/Eltex/WOP/get_metrics.py +++ b/sa/profiles/Eltex/WOP/get_metrics.py @@ -13,7 +13,7 @@ from collections import defaultdict # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class Script(GetMetricsScript): diff --git a/sa/profiles/Ericsson/SEOS/get_interfaces.py b/sa/profiles/Ericsson/SEOS/get_interfaces.py index 1a851aaa642e598b54d9825020bd359c851c1331..198d3f589ea16fba341ea427186a0a1920e9efd8 100644 --- a/sa/profiles/Ericsson/SEOS/get_interfaces.py +++ b/sa/profiles/Ericsson/SEOS/get_interfaces.py @@ -15,7 +15,7 @@ from noc.sa.profiles.Generic.get_interfaces import Script as BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.mac import MAC from noc.core.ip import IPv4 -from noc.lib.validators import is_mac +from noc.core.validators import is_mac class Script(BaseScript): diff --git a/sa/profiles/Ericsson/SEOS/get_mac_address_table.py b/sa/profiles/Ericsson/SEOS/get_mac_address_table.py index eb22304e33c3bc5ef86a36db8cee3ccd33226047..265151275aefbc7c98b0fd28535c8017550ce154 100644 --- a/sa/profiles/Ericsson/SEOS/get_mac_address_table.py +++ b/sa/profiles/Ericsson/SEOS/get_mac_address_table.py @@ -10,7 +10,7 @@ from noc.core.script.base import BaseScript from noc.sa.interfaces.igetmacaddresstable import IGetMACAddressTable from noc.core.text import parse_table -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Extreme/Summit200/get_interfaces.py b/sa/profiles/Extreme/Summit200/get_interfaces.py index 1dff63f5a126a1936e1bdbc289be678c984d1874..3803ca063cf363c2fc71bb2fc558f3397b1b88dc 100644 --- a/sa/profiles/Extreme/Summit200/get_interfaces.py +++ b/sa/profiles/Extreme/Summit200/get_interfaces.py @@ -13,7 +13,7 @@ import re from noc.sa.profiles.Generic.get_interfaces import Script as BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.ip import IPv4 -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Extreme/Summit200/profile.py b/sa/profiles/Extreme/Summit200/profile.py index 1f3ee9861b59b01dd75893765da3709de6d3c6d4..16b2b429d94a2dc964529faa6b00ec894baa927e 100644 --- a/sa/profiles/Extreme/Summit200/profile.py +++ b/sa/profiles/Extreme/Summit200/profile.py @@ -9,7 +9,7 @@ # NOC modules from noc.core.profile.base import BaseProfile -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/Extreme/XOS/get_dom_status.py b/sa/profiles/Extreme/XOS/get_dom_status.py index ddd46f3bb3af4bf2beb20e1aa1e30497bddba731..b3f3504b0532d3f4d32797ed45bdecb5a7a842f9 100644 --- a/sa/profiles/Extreme/XOS/get_dom_status.py +++ b/sa/profiles/Extreme/XOS/get_dom_status.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetdomstatus import IGetDOMStatus from noc.core.text import parse_kv -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.convert.dbm import mw2dbm diff --git a/sa/profiles/Extreme/XOS/get_inventory.py b/sa/profiles/Extreme/XOS/get_inventory.py index e9b4751fc718916f4d98ab66254424113f4a981c..e1b8d5ae07da695b55f1b3bb85b22d44c71b8c3a 100644 --- a/sa/profiles/Extreme/XOS/get_inventory.py +++ b/sa/profiles/Extreme/XOS/get_inventory.py @@ -15,7 +15,7 @@ from collections import defaultdict from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinventory import IGetInventory from noc.core.text import parse_kv -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Extreme/XOS/get_lldp_neighbors.py b/sa/profiles/Extreme/XOS/get_lldp_neighbors.py index e4b839c6a01298defaa838e4bd35cd1f5a4b2d48..adb44464fc5fa678844303aedafbe98eb199a5e8 100644 --- a/sa/profiles/Extreme/XOS/get_lldp_neighbors.py +++ b/sa/profiles/Extreme/XOS/get_lldp_neighbors.py @@ -13,7 +13,7 @@ import re from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors from noc.sa.interfaces.base import MACAddressParameter -from noc.lib.validators import is_int, is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_int, is_ipv4, is_ipv6, is_mac from noc.core.lldp import ( LLDP_CHASSIS_SUBTYPE_MAC, LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS, diff --git a/sa/profiles/Generic/get_interfaces.py b/sa/profiles/Generic/get_interfaces.py index df4a3bc8d98fc3792064fb07b9fb0b543df0d8af..b63268da93b87004dac68b656df632516409a234 100644 --- a/sa/profiles/Generic/get_interfaces.py +++ b/sa/profiles/Generic/get_interfaces.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Generic.get_interfaces # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -16,7 +16,7 @@ from noc.sa.interfaces.igetinterfaces import IGetInterfaces from noc.core.mac import MAC from noc.core.mib import mib from noc.core.ip import IPv4 -from noc.lib.validators import is_mac +from noc.core.validators import is_mac class Script(BaseScript): diff --git a/sa/profiles/Generic/get_uptime.py b/sa/profiles/Generic/get_uptime.py index e2c1cb1217b6e164525296b998e740676072c914..0783bc183117ca78d8cf51cb9e80f8e935709b40 100644 --- a/sa/profiles/Generic/get_uptime.py +++ b/sa/profiles/Generic/get_uptime.py @@ -2,14 +2,14 @@ # --------------------------------------------------------------------- # Generic.get_uptime # --------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetuptime import IGetUptime -from noc.lib.validators import is_float +from noc.core.validators import is_float from noc.core.mib import mib diff --git a/sa/profiles/Huawei/VRP/get_interfaces.py b/sa/profiles/Huawei/VRP/get_interfaces.py index 5fb7e2c6307acbb70cd374806cde89b1bff1d4e4..55378b17a619c70835f0f6f49814d3ef98a15e15 100644 --- a/sa/profiles/Huawei/VRP/get_interfaces.py +++ b/sa/profiles/Huawei/VRP/get_interfaces.py @@ -18,7 +18,7 @@ import six # NOC modules from noc.sa.profiles.Generic.get_interfaces import Script as BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_vlan +from noc.core.validators import is_vlan class Script(BaseScript): diff --git a/sa/profiles/Huawei/VRP/get_switchport.py b/sa/profiles/Huawei/VRP/get_switchport.py index cf3d89ccf1077d018618687dd4567c82c54d1cb7..b80b3d2081e8cf1ca2f18da39aeedcc7e3a802e6 100644 --- a/sa/profiles/Huawei/VRP/get_switchport.py +++ b/sa/profiles/Huawei/VRP/get_switchport.py @@ -15,7 +15,7 @@ from binascii import hexlify # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetswitchport import IGetSwitchport -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.mib import mib diff --git a/sa/profiles/IBM/NOS/get_lldp_neighbors.py b/sa/profiles/IBM/NOS/get_lldp_neighbors.py index 50c433f29fb237debba44ac4b090ab7dd7c4302e..6f48c084e309bf4d95572cebd3a88194ca319cd6 100644 --- a/sa/profiles/IBM/NOS/get_lldp_neighbors.py +++ b/sa/profiles/IBM/NOS/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # IBM.NOS.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_int, is_ipv4 +from noc.core.validators import is_int, is_ipv4 from noc.sa.interfaces.base import MACAddressParameter diff --git a/sa/profiles/Iskratel/ESCOM/get_lldp_neighbors.py b/sa/profiles/Iskratel/ESCOM/get_lldp_neighbors.py index dfcc0250182105275a9c476ec16b704cf1d71a02..518b3c8f98770d0c3fbf2b84e77d25383d1272f9 100644 --- a/sa/profiles/Iskratel/ESCOM/get_lldp_neighbors.py +++ b/sa/profiles/Iskratel/ESCOM/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/Iskratel/ESCOM/ping.py b/sa/profiles/Iskratel/ESCOM/ping.py index bbf1e808bddc0630ca1af21048b2605ac4386273..af06c69e3db0f185b9a8523ba1da3104093e28fe 100644 --- a/sa/profiles/Iskratel/ESCOM/ping.py +++ b/sa/profiles/Iskratel/ESCOM/ping.py @@ -2,14 +2,14 @@ # --------------------------------------------------------------------- # Iskratel.ESCOM.ping # --------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- """ """ from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 import re diff --git a/sa/profiles/Juniper/JUNOS/get_capabilities.py b/sa/profiles/Juniper/JUNOS/get_capabilities.py index 504b44b84c040838ab870644562bc50231f0cc74..b977a02d5230c0b86ef2bf9a1d7bdce4dddb125b 100644 --- a/sa/profiles/Juniper/JUNOS/get_capabilities.py +++ b/sa/profiles/Juniper/JUNOS/get_capabilities.py @@ -10,7 +10,7 @@ from noc.sa.profiles.Generic.get_capabilities import Script as BaseScript from noc.sa.profiles.Generic.get_capabilities import false_on_cli_error from noc.core.mib import mib -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Juniper/JUNOS/get_inventory.py b/sa/profiles/Juniper/JUNOS/get_inventory.py index 45d7a8358db39a08e6fcab1dbe9659591b624719..c3a8b72e75cca16a3deeb61a60f6bf2471e1364f 100644 --- a/sa/profiles/Juniper/JUNOS/get_inventory.py +++ b/sa/profiles/Juniper/JUNOS/get_inventory.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Juniper.JUNOS.get_inventory # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinventory import IGetInventory -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Juniper/JUNOS/get_lldp_neighbors.py b/sa/profiles/Juniper/JUNOS/get_lldp_neighbors.py index e9116b5237d66b43b371615ebe3872d757f9e4de..0a99602c9a7a5bb1473a655fadc81597fc400221 100644 --- a/sa/profiles/Juniper/JUNOS/get_lldp_neighbors.py +++ b/sa/profiles/Juniper/JUNOS/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Juniper.JUNOS.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -14,7 +14,7 @@ import six from noc.sa.profiles.Generic.get_lldp_neighbors import Script as BaseScript from noc.sa.interfaces.base import IntParameter from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_int +from noc.core.validators import is_int from noc.core.mib import mib diff --git a/sa/profiles/Juniper/JUNOSe/ping.py b/sa/profiles/Juniper/JUNOSe/ping.py index 092fb6f63417a13e69a7d54aa8d8150907ca2bfb..75b73edbec10cf9a74dd1233e1e0cbd987f2ed14 100644 --- a/sa/profiles/Juniper/JUNOSe/ping.py +++ b/sa/profiles/Juniper/JUNOSe/ping.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class Script(BaseScript): diff --git a/sa/profiles/Linksys/SPS2xx/get_mac_address_table.py b/sa/profiles/Linksys/SPS2xx/get_mac_address_table.py index 9172a2a8ac4eafedc06d2460a7c9c1108bc57c6c..f56a5932d0c5740998fc88c2caf0e61fdf79640f 100644 --- a/sa/profiles/Linksys/SPS2xx/get_mac_address_table.py +++ b/sa/profiles/Linksys/SPS2xx/get_mac_address_table.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Linksys.SPS2xx.get_mac_address_table # --------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetmacaddresstable import IGetMACAddressTable -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/MikroTik/RouterOS/get_interfaces.py b/sa/profiles/MikroTik/RouterOS/get_interfaces.py index 8077952f9b21a44f6e9c5d8680baf1b863b71e67..6c4824ce68b553a558ff3e1d31e12820c6b137e1 100644 --- a/sa/profiles/MikroTik/RouterOS/get_interfaces.py +++ b/sa/profiles/MikroTik/RouterOS/get_interfaces.py @@ -15,7 +15,7 @@ import six # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/NSN/TIMOS/get_interfaces.py b/sa/profiles/NSN/TIMOS/get_interfaces.py index b995e48b90cb8ffa81c7ecf512a867e88f829554..943cdcca4bf4c5fe708d1cd4c75b121471bfdc11 100644 --- a/sa/profiles/NSN/TIMOS/get_interfaces.py +++ b/sa/profiles/NSN/TIMOS/get_interfaces.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # NSN.TIMOS.get_interfaces # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetinterfaces import IGetInterfaces -from noc.lib.validators import is_int, is_ipv6, is_vlan +from noc.core.validators import is_int, is_ipv6, is_vlan class Script(BaseScript): diff --git a/sa/profiles/Planet/WGSD/profile.py b/sa/profiles/Planet/WGSD/profile.py index d3d3e53dc13de636ef9871ecbe993d98d530f2a3..a7eada32e43dce33744dc86ac43b972180a841e1 100644 --- a/sa/profiles/Planet/WGSD/profile.py +++ b/sa/profiles/Planet/WGSD/profile.py @@ -3,13 +3,13 @@ # Vendor: Planet # OS: WGSD # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- # NOC modules from noc.core.profile.base import BaseProfile -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/Qtech/QSW/get_lldp_neighbors.py b/sa/profiles/Qtech/QSW/get_lldp_neighbors.py index 810d53d4ac9926d6ecdcc5db17038349b4913d97..326b60e6bf5afe04e7a90eebcef809c2c48508af 100644 --- a/sa/profiles/Qtech/QSW/get_lldp_neighbors.py +++ b/sa/profiles/Qtech/QSW/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Qtech.QSW.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_int, is_ipv4, is_mac +from noc.core.validators import is_int, is_ipv4, is_mac class Script(BaseScript): diff --git a/sa/profiles/Qtech/QSW2500/profile.py b/sa/profiles/Qtech/QSW2500/profile.py index 33d3e899e117acc8b9da097daf176ff005a8f50c..eea7ad3e1e9f175d87504ee0bc226f6b055aaa28 100644 --- a/sa/profiles/Qtech/QSW2500/profile.py +++ b/sa/profiles/Qtech/QSW2500/profile.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.profile.base import BaseProfile -from noc.lib.validators import is_int +from noc.core.validators import is_int class Profile(BaseProfile): diff --git a/sa/profiles/Qtech/QSW2800/get_switchport.py b/sa/profiles/Qtech/QSW2800/get_switchport.py index ab035f0e99c6ea830fddb114e1657203e8f40498..7959abc40b48eab1b2becc369fe69288a1768bee 100644 --- a/sa/profiles/Qtech/QSW2800/get_switchport.py +++ b/sa/profiles/Qtech/QSW2800/get_switchport.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Qtech.QSW2800.get_switchport # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.sa.profiles.Generic.get_switchport import Script as BaseScript from noc.sa.interfaces.igetswitchport import IGetSwitchport -from noc.lib.validators import is_int +from noc.core.validators import is_int class Script(BaseScript): diff --git a/sa/profiles/Raisecom/ROS/get_lldp_neighbors.py b/sa/profiles/Raisecom/ROS/get_lldp_neighbors.py index f38bdcf4d40de9a17cc23cba6a69473163aa57aa..d57312ecf3e5d7f66ca7aabe64e8c9e165c863de 100644 --- a/sa/profiles/Raisecom/ROS/get_lldp_neighbors.py +++ b/sa/profiles/Raisecom/ROS/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Raisecom.ROS.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.lldp import ( LLDP_CHASSIS_SUBTYPE_MAC, LLDP_CHASSIS_SUBTYPE_NETWORK_ADDRESS, diff --git a/sa/profiles/Rotek/RTBS/get_metrics.py b/sa/profiles/Rotek/RTBS/get_metrics.py index 4914539634f104b65ac364500ca75b6c1ba6aa47..abb1b52a2e0c136c95daf810d1979df9f1b11fb2 100644 --- a/sa/profiles/Rotek/RTBS/get_metrics.py +++ b/sa/profiles/Rotek/RTBS/get_metrics.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Rotek.RTBS.get_metrics # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -12,7 +12,7 @@ from __future__ import absolute_import # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics from .oidrules.platform import PlatformRule -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class Script(GetMetricsScript): diff --git a/sa/profiles/Rotek/RTBSv1/get_metrics.py b/sa/profiles/Rotek/RTBSv1/get_metrics.py index 090f79482c14e9014fced839e2564fc703a200eb..444233850638e4cad176733eb83a742f3aa93d22 100644 --- a/sa/profiles/Rotek/RTBSv1/get_metrics.py +++ b/sa/profiles/Rotek/RTBSv1/get_metrics.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Rotek.RTBSv1.get_metrics # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -11,7 +11,7 @@ from __future__ import absolute_import # NOC modules from noc.sa.profiles.Generic.get_metrics import Script as GetMetricsScript, metrics -from noc.lib.validators import is_ipv4 +from noc.core.validators import is_ipv4 class Script(GetMetricsScript): diff --git a/sa/profiles/SKS/SKS/get_lldp_neighbors.py b/sa/profiles/SKS/SKS/get_lldp_neighbors.py index 8cd4e1475a5c0d242a8f22a1b533be4a4af75c95..092f74fd9946dbc45c517ed79e5377b2387dab59 100644 --- a/sa/profiles/SKS/SKS/get_lldp_neighbors.py +++ b/sa/profiles/SKS/SKS/get_lldp_neighbors.py @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac from noc.core.text import parse_table diff --git a/sa/profiles/SKS/SKS/ping.py b/sa/profiles/SKS/SKS/ping.py index 3506245be211590b1a2eb67a8e07bb461fefd0d2..cf6a66c3a29afd7cb1f10cb3aa54ca2aea3950b2 100644 --- a/sa/profiles/SKS/SKS/ping.py +++ b/sa/profiles/SKS/SKS/ping.py @@ -2,14 +2,14 @@ # --------------------------------------------------------------------- # SKS.SKS.ping # --------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- """ """ from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 import re diff --git a/sa/profiles/Siklu/EH/get_lldp_neighbors.py b/sa/profiles/Siklu/EH/get_lldp_neighbors.py index ed95380897c899152748a3aefe010b15332ec58f..f0aa90cc1285b982eba61b4f7ac974c34ab8a83e 100644 --- a/sa/profiles/Siklu/EH/get_lldp_neighbors.py +++ b/sa/profiles/Siklu/EH/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Siklu.EH.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -22,7 +22,7 @@ from noc.core.lldp import ( LLDP_PORT_SUBTYPE_NAME, LLDP_PORT_SUBTYPE_LOCAL, ) -from noc.lib.validators import is_mac +from noc.core.validators import is_mac class Script(BaseScript): diff --git a/sa/profiles/Upvel/UP/get_lldp_neighbors.py b/sa/profiles/Upvel/UP/get_lldp_neighbors.py index f464792c8559032bf8f97f0b0e619c75922ec996..56d064408d256056f121d89d4941aa341ce9a6e8 100644 --- a/sa/profiles/Upvel/UP/get_lldp_neighbors.py +++ b/sa/profiles/Upvel/UP/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Upvel.UP.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac class Script(BaseScript): diff --git a/sa/profiles/Upvel/UP/ping.py b/sa/profiles/Upvel/UP/ping.py index f3228cd87830fc709e56bb3864ed1590bc3ad9f6..a0959284f97c76f5462d1779fa937c030c7b2cec 100644 --- a/sa/profiles/Upvel/UP/ping.py +++ b/sa/profiles/Upvel/UP/ping.py @@ -2,14 +2,14 @@ # --------------------------------------------------------------------- # Upvel.UP.ping # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- """ """ from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 import re diff --git a/sa/profiles/Vitesse/VSC/get_lldp_neighbors.py b/sa/profiles/Vitesse/VSC/get_lldp_neighbors.py index 6c4dacb80fb2e994661e50495a7859b51e45d1e5..a39da8a6b31ad9a11b30fbc50364fa9a2be08eaa 100644 --- a/sa/profiles/Vitesse/VSC/get_lldp_neighbors.py +++ b/sa/profiles/Vitesse/VSC/get_lldp_neighbors.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Vitesse.VSC.get_lldp_neighbors # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -12,7 +12,7 @@ import re # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_ipv4, is_ipv6, is_mac +from noc.core.validators import is_ipv4, is_ipv6, is_mac class Script(BaseScript): diff --git a/sa/profiles/Vitesse/VSC/ping.py b/sa/profiles/Vitesse/VSC/ping.py index e4cf1ad855f4f8ffff20f5e053e1958bc8ab13a2..d8a3ce8efaa78f5a0056f4092c3df5a37ee4d3f6 100644 --- a/sa/profiles/Vitesse/VSC/ping.py +++ b/sa/profiles/Vitesse/VSC/ping.py @@ -2,14 +2,14 @@ # --------------------------------------------------------------------- # Vitesse.VSC.ping # --------------------------------------------------------------------- -# Copyright (C) 2007-2016 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- """ """ from noc.core.script.base import BaseScript from noc.sa.interfaces.iping import IPing -from noc.lib.validators import is_ipv4, is_ipv6 +from noc.core.validators import is_ipv4, is_ipv6 import re diff --git a/sa/profiles/Zyxel/ZyNOS/get_lldp_neighbors.py b/sa/profiles/Zyxel/ZyNOS/get_lldp_neighbors.py index 5fc62d53a39c1e1279058a97a59efb4329329d79..35a8e1db78f230b91e9aceb65e4a06f663364a22 100644 --- a/sa/profiles/Zyxel/ZyNOS/get_lldp_neighbors.py +++ b/sa/profiles/Zyxel/ZyNOS/get_lldp_neighbors.py @@ -9,7 +9,7 @@ # NOC modules from noc.core.script.base import BaseScript from noc.sa.interfaces.igetlldpneighbors import IGetLLDPNeighbors -from noc.lib.validators import is_int, is_ipv4, is_mac +from noc.core.validators import is_int, is_ipv4, is_mac # Python standard modules import re diff --git a/services/discovery/jobs/box/address.py b/services/discovery/jobs/box/address.py index 937f4bc6858ce40dce3961be870f5eb7e5d0284b..b8857bb48e9912dee7dac64c531af8e7a6337aea 100644 --- a/services/discovery/jobs/box/address.py +++ b/services/discovery/jobs/box/address.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # Address check # ---------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -16,7 +16,7 @@ from noc.ip.models.prefix import Prefix from noc.ip.models.address import Address from noc.core.perf import metrics from noc.core.handler import get_handler -from noc.lib.validators import is_fqdn +from noc.core.validators import is_fqdn from noc.core.ip import IP, IPv4, PrefixDB diff --git a/services/discovery/jobs/box/cdp.py b/services/discovery/jobs/box/cdp.py index fd03ce8864ce42888697fc902dc54185d325febe..e2dad42e5f7a971307a5a3dac3e5d63c59a7dd64 100644 --- a/services/discovery/jobs/box/cdp.py +++ b/services/discovery/jobs/box/cdp.py @@ -2,13 +2,13 @@ # --------------------------------------------------------------------- # CDP check # --------------------------------------------------------------------- -# Copyright (C) 2007-2015 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- # NOC modules from noc.services.discovery.jobs.base import TopologyDiscoveryCheck -from noc.lib.validators import is_ipv4, is_mac +from noc.core.validators import is_ipv4, is_mac class CDPCheck(TopologyDiscoveryCheck): diff --git a/services/discovery/jobs/box/lldp.py b/services/discovery/jobs/box/lldp.py index 7dfc8bd4876138611abdd4253a8d54612c5a9b3f..fdd3346d7e8395048b8964af935307d88f9d2f26 100644 --- a/services/discovery/jobs/box/lldp.py +++ b/services/discovery/jobs/box/lldp.py @@ -2,13 +2,13 @@ # --------------------------------------------------------------------- # LLDP check # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- # NOC modules from noc.services.discovery.jobs.base import TopologyDiscoveryCheck -from noc.lib.validators import is_ipv4, is_int +from noc.core.validators import is_ipv4, is_int from noc.sa.interfaces.base import MACAddressParameter, InterfaceTypeError from noc.inv.models.interface import Interface from noc.inv.models.subinterface import SubInterface diff --git a/services/web/apps/fm/classificationrule/views.py b/services/web/apps/fm/classificationrule/views.py index 068f809da8bb80fef7b441be4686841ce21d0c21..c0c3b1eaf3dbc4e324e8420e8f542bbb463c3c4d 100644 --- a/services/web/apps/fm/classificationrule/views.py +++ b/services/web/apps/fm/classificationrule/views.py @@ -20,7 +20,7 @@ from noc.fm.models.eventclassificationrule import ( ) from noc.fm.models.eventclass import EventClass from noc.fm.models.mib import MIB -from noc.lib.validators import is_objectid, is_oid +from noc.core.validators import is_objectid, is_oid from noc.fm.models.utils import get_event from noc.core.translation import ugettext as _ diff --git a/services/web/apps/inv/inv/views.py b/services/web/apps/inv/inv/views.py index 44d2fb76734050aaf85dc823bdd52ef125d14ccc..05ebd5df34f568714137f2f0b7db1ac469b46f91 100644 --- a/services/web/apps/inv/inv/views.py +++ b/services/web/apps/inv/inv/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # inv.inv application # --------------------------------------------------------------------- -# Copyright (C) 2007-2013 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -15,7 +15,7 @@ import os from noc.lib.app.extapplication import ExtApplication, view from noc.inv.models.object import Object from noc.inv.models.objectmodel import ObjectModel -from noc.lib.validators import is_objectid +from noc.core.validators import is_objectid from noc.sa.interfaces.base import ( StringParameter, ObjectIdParameter, diff --git a/services/web/apps/ip/addressrange/views.py b/services/web/apps/ip/addressrange/views.py index 0154755aa1ea97bf926eb7fbccb2fed3f1b617b1..7b3efbf71126f95819eaa35a8e284897a0e4c3b4 100644 --- a/services/web/apps/ip/addressrange/views.py +++ b/services/web/apps/ip/addressrange/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # ip.addressrange application # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -10,7 +10,7 @@ from noc.lib.app.extmodelapplication import ExtModelApplication from noc.ip.models.addressrange import AddressRange from noc.core.ip import IP -from noc.lib.validators import is_ipv4, is_ipv6, is_fqdn +from noc.core.validators import is_ipv4, is_ipv6, is_fqdn from noc.core.translation import ugettext as _ diff --git a/services/web/apps/ip/ipam/views.py b/services/web/apps/ip/ipam/views.py index 242009b5f097260826b9fec89827fcba11d47cde..48c1c7ac4837c6dfa40cdfb3c058b11d67924ce2 100644 --- a/services/web/apps/ip/ipam/views.py +++ b/services/web/apps/ip/ipam/views.py @@ -19,7 +19,7 @@ from noc.core.ip import IP # NOC modules from noc.lib.app.extapplication import ExtApplication, view -from noc.lib.validators import is_ipv4, is_ipv4_prefix, is_ipv6, is_ipv6_prefix +from noc.core.validators import is_ipv4, is_ipv4_prefix, is_ipv6, is_ipv6_prefix from noc.ip.models.address import Address from noc.ip.models.addressrange import AddressRange from noc.ip.models.prefix import Prefix diff --git a/services/web/apps/ip/reportallocated/views.py b/services/web/apps/ip/reportallocated/views.py index c9b9d3e365cebad57cb8cef0684118cf725e7fa9..a407bdf1ab0679427e7e4397504034a6b206b5b6 100644 --- a/services/web/apps/ip/reportallocated/views.py +++ b/services/web/apps/ip/reportallocated/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Allocated Blocks Report # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -13,7 +13,7 @@ from django.db.models import Q # NOC Modules from noc.lib.app.simplereport import SimpleReport, TableColumn -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError from noc.ip.models.vrf import VRF from noc.ip.models.prefix import Prefix from noc.main.models.customfield import CustomField diff --git a/services/web/apps/ip/reportexpanded/views.py b/services/web/apps/ip/reportexpanded/views.py index 90649705823d28d6cf8473a6c616b07834d2d878..433df03861b13a6bb2896306dfc4cb757090ef1f 100644 --- a/services/web/apps/ip/reportexpanded/views.py +++ b/services/web/apps/ip/reportexpanded/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Expanded Report # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -15,7 +15,7 @@ from noc.lib.app.simplereport import SimpleReport, TableColumn from noc.ip.models.vrf import VRF from noc.ip.models.prefix import Prefix from noc.main.models.customfield import CustomField -from noc.lib.validators import check_ipv6_prefix, check_ipv4_prefix, ValidationError +from noc.core.validators import check_ipv6_prefix, check_ipv4_prefix, ValidationError class ReportForm(forms.Form): diff --git a/services/web/apps/ip/reportfree/views.py b/services/web/apps/ip/reportfree/views.py index 63ffd696d147a8e12e734f0a5a07a0227c666f9c..2296826967de33e6fc48c9aff5164be1bef53b09 100644 --- a/services/web/apps/ip/reportfree/views.py +++ b/services/web/apps/ip/reportfree/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Free Blocks Report # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -14,7 +14,7 @@ from django import forms from noc.lib.app.simplereport import SimpleReport from noc.ip.models.vrf import VRF from noc.ip.models.prefix import Prefix -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError from noc.core.ip import IP diff --git a/services/web/apps/ip/reportsummary/views.py b/services/web/apps/ip/reportsummary/views.py index 60c8c0fac4567d6db8ff2b8eac8436c4c5cbad88..37170f6fc8921708b4e6818edac401052d273314 100644 --- a/services/web/apps/ip/reportsummary/views.py +++ b/services/web/apps/ip/reportsummary/views.py @@ -2,7 +2,7 @@ # --------------------------------------------------------------------- # Summary Report # --------------------------------------------------------------------- -# Copyright (C) 2007-2018 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # --------------------------------------------------------------------- @@ -17,7 +17,7 @@ from django import forms from noc.lib.app.simplereport import SimpleReport, TableColumn from noc.ip.models.vrf import VRF from noc.ip.models.prefix import Prefix -from noc.lib.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError +from noc.core.validators import check_ipv4_prefix, check_ipv6_prefix, ValidationError from noc.core.ip import IP diff --git a/services/web/apps/kb/parsers/base.py b/services/web/apps/kb/parsers/base.py index e29c90dada56fb79a8fe2290114a74a238d0844a..1302cf9f618f9876d1fdfd70b7a5afcca69db599 100644 --- a/services/web/apps/kb/parsers/base.py +++ b/services/web/apps/kb/parsers/base.py @@ -8,7 +8,7 @@ # NOC modules from __future__ import absolute_import -from noc.lib.validators import is_int +from noc.core.validators import is_int BASE_PATH = "/api/card/view/kb" diff --git a/services/web/apps/peer/peer/views.py b/services/web/apps/peer/peer/views.py index d10c23e3faed9104836a96ec6368b6bed3a7f5d3..633edaa15670338e42d774747bed2a69086f2572 100644 --- a/services/web/apps/peer/peer/views.py +++ b/services/web/apps/peer/peer/views.py @@ -9,7 +9,7 @@ # NOC modules from noc.lib.app.extmodelapplication import ExtModelApplication, view from noc.peer.models.peer import Peer -from noc.lib.validators import is_prefix +from noc.core.validators import is_prefix from noc.core.ip import IP from noc.lib.app.repoinline import RepoInline from noc.sa.interfaces.base import ListOfParameter, ModelParameter diff --git a/services/web/apps/sa/service/views.py b/services/web/apps/sa/service/views.py index f7a5d966f7046cfbdc81459b8e8f7ce2b6bc76ff..8e35fc35c4b33b47c6b2b3323dfe625e6953e4bc 100644 --- a/services/web/apps/sa/service/views.py +++ b/services/web/apps/sa/service/views.py @@ -2,7 +2,7 @@ # ---------------------------------------------------------------------- # sa.service application # ---------------------------------------------------------------------- -# Copyright (C) 2007-2017 The NOC Project +# Copyright (C) 2007-2019 The NOC Project # See LICENSE for details # ---------------------------------------------------------------------- @@ -13,7 +13,7 @@ from mongoengine.queryset import Q from noc.lib.app.extdocapplication import ExtDocApplication from noc.sa.models.service import Service from noc.core.translation import ugettext as _ -from noc.lib.validators import is_objectid +from noc.core.validators import is_objectid class ServiceApplication(ExtDocApplication): diff --git a/tests/test_validators.py b/tests/test_validators.py index aa0a0d0223123840fe4dd82b851f8876050c9091..6689931cc879585d93aebc8c41da034a34df2881 100644 --- a/tests/test_validators.py +++ b/tests/test_validators.py @@ -10,7 +10,7 @@ import pytest # NOC modules -from noc.lib.validators import ( +from noc.core.validators import ( is_int, is_float, is_asn,