Changeset 793de0500027 in nodewatcher


Ignore:
Timestamp:
05/07/2018 12:59:13 AM (15 months ago)
Author:
Robert Marko <robimarko@…>
Branches:
Travis-warnings
Parents:
e388fa5d58e5 (diff), 8e31451be45171cef811e3ac652f547024886fde (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Robert Marko <robimarko@…> (05/07/2018 12:59:13 AM)
git-committer:
Robert Marko <robimarko@…> (05/07/2018 12:59:13 AM)
Message:

Merge remote-tracking branch 'WlanSi-Nodewatcher/Travis-warnings' into Travis-warnings

Files:
16 edited

Legend:

Unmodified
Added
Removed
  • tox.ini

    rfd24682b2ec7 r8e31451be451  
    11[pycodestyle] 
    22exclude=nodewatcher/legacy/nodes/templatetags,nodewatcher/extra/accounts/md5crypt.py,nodewatcher/utils/ipaddr.py,migrations 
    3 ignore=E261,E501,E265,E722,E731 
     3ignore=E261,E501,E265,E722,E731,W504 
  • nodewatcher/core/admin.py

    r6535bd9efbbac re388fa5d58e5  
    99    readonly_fields = ('uuid',) 
    1010 
     11 
    1112admin.site.register(models.Node, NodeAdmin) 
  • nodewatcher/core/models.py

    re8b8ee7d015f re388fa5d58e5  
    4141        return reverse('DisplayComponent:node', kwargs={'pk': self.pk}) 
    4242 
     43 
    4344# Create registration point 
    4445registration.create_point(Node, 'config') 
     
    6768        lookup_proxies = ['name'] 
    6869 
     70 
    6971registration.point('node.config').register_item(GeneralConfig) 
    7072 
     
    8890        multiple = True 
    8991        hidden = True 
     92 
    9093 
    9194registration.point('node.config').register_choice('core.routerid#family', registration.Choice('ipv4', _("IPv4"))) 
     
    125128        super(StaticIpRouterIdConfig, self).save(*args, **kwargs) 
    126129 
     130 
    127131registration.point('node.config').register_item(StaticIpRouterIdConfig) 
  • nodewatcher/extra/accounts/admin.py

    r090c46f8875b re388fa5d58e5  
    184184        return form 
    185185 
     186 
    186187# Re-register UserAdmin and GroupAdmin. 
    187188admin.site.unregister(auth_models.User) 
  • nodewatcher/extra/accounts/forms.py

    r3bf64e9d6d91 re388fa5d58e5  
    223223        setup_forms.check_password_length(self) 
    224224 
     225 
    225226# TODO: Probably not needed anymore in Django 1.9. 
    226227#       See: https://github.com/django/django/commit/28986da4ca167ae257abcaf7caea230eca2bcd80 
  • nodewatcher/extra/accounts/frontend.py

    rab0f1b6f48a7 re388fa5d58e5  
    1717            urls.url(r'^user/(?P<username>[\w.@+-]+)/$', views.user, name='user_page'), 
    1818        ] 
     19 
    1920 
    2021components.pool.register(AccountsComponent) 
     
    6263    return url 
    6364 
     65 
    6466components.menus.get_menu('accounts_menu').add(components.MenuEntry( 
    6567    label=components.ugettext_lazy("Login"), 
  • nodewatcher/extra/accounts/models.py

    r97509f887428 re388fa5d58e5  
    113113    instance.user.email_user(subject, message, settings.DEFAULT_FROM_EMAIL) 
    114114 
     115 
    115116registration_models.RegistrationProfile.send_activation_email = send_activation_email 
    116117 
     
    131132    return orig_activation_key_expired(instance) 
    132133 
     134 
    133135activation_key_expired.boolean = True 
    134136registration_models.RegistrationProfile.activation_key_expired = activation_key_expired 
  • nodewatcher/extra/commotion/forms.py

    r01b7ab6499c4 re388fa5d58e5  
    2424            state.update_item(general_config, platform='openwrt') 
    2525 
     26 
    2627registration.point('node.config').add_form_defaults(DefaultPlatform()) 
    2728 
     
    3940        elif not type_config.type: 
    4041            state.update_item(type_config, type='wireless') 
     42 
    4143 
    4244registration.point('node.config').add_form_defaults(DefaultType()) 
     
    6668                state.update_item(project_config, project=commotion_project) 
    6769 
     70 
    6871registration.point('node.config').add_form_defaults(DefaultProject()) 
    6972 
     
    7679        else: 
    7780            state.update_item(telemetry_config, source='push') 
     81 
    7882 
    7983registration.point('node.config').add_form_defaults(DefaultTelemetrySource()) 
     
    9498                password=crypto.get_random_string(), 
    9599            ) 
     100 
    96101 
    97102registration.point('node.config').add_form_defaults(DefaultPassword()) 
     
    210215        return self.setup_item(state, 'core.interfaces.network', klass, configuration, parent=interface, **filter) 
    211216 
     217 
    212218registration.point('node.config').add_form_defaults(NetworkConfiguration()) 
  • nodewatcher/extra/commotion/models.py

    ra49a8c6b811e7 re388fa5d58e5  
    2525        registry_name = _("Commotion") 
    2626 
     27 
    2728registration.point('node.config').register_choice('commotion.network#network_class', registration.Choice('mesh', _("Mesh"))) 
    2829registration.point('node.config').register_choice('commotion.network#network_class', registration.Choice('client', _("Client"))) 
  • nodewatcher/extra/fonticons/fonticons.py

    r132dbe3bef07 re388fa5d58e5  
    224224            for name in icon["names"]: 
    225225                fp.write(".%s-%s:before {" % (prefix, name)) 
    226                 fp.write("content: '\%s';" % hex(icon['character'])[2:]) 
     226                fp.write("content: '\.%s';" % hex(icon['character'])[2:]) 
    227227                fp.write("}\n") 
    228228 
  • nodewatcher/extra/irnas/koruza/models.py

    r483a20576d69 re388fa5d58e5  
    1717        registry_name = _("IRNAS KORUZA Network Measurement") 
    1818 
     19 
    1920registration.point('node.config').register_choice('irnas.koruza.netmeasure#role', registration.Choice('primary', _("Primary"))) 
    2021registration.point('node.config').register_choice('irnas.koruza.netmeasure#role', registration.Choice('secondary', _("Secondary"))) 
     
    3233        registry_id = 'koruza.vpn' 
    3334 
     35 
    3436registration.point('node.monitoring').register_item(KoruzaVpnMonitor) 
    3537 
     
    4547        registry_id = 'koruza.link' 
    4648 
     49 
    4750registration.point('node.monitoring').register_item(KoruzaLinkMonitor) 
  • nodewatcher/extra/irnas/koruza_defaults/forms.py

    rcb914c95fce8 re388fa5d58e5  
    2020            state.update_item(general_config, platform='openwrt') 
    2121 
     22 
    2223registration.point('node.config').add_form_defaults(DefaultPlatform()) 
    2324 
     
    3536        elif not type_config.type: 
    3637            state.update_item(type_config, type='koruza') 
     38 
    3739 
    3840registration.point('node.config').add_form_defaults(DefaultType()) 
     
    6264                state.update_item(project_config, project=koruza_project) 
    6365 
     66 
    6467registration.point('node.config').add_form_defaults(DefaultProject()) 
    6568 
     
    7376            state.update_item(telemetry_config, source='push') 
    7477 
     78 
    7579registration.point('node.config').add_form_defaults(DefaultTelemetrySource()) 
     80 
  • nodewatcher/extra/irnas/koruzav2/models.py

    ra051913684a5a re388fa5d58e5  
    4848    class RegistryMeta: 
    4949        registry_id = 'irnas.koruza' 
     50 
    5051 
    5152registration.point('node.monitoring').register_item(KoruzaMonitor) 
     
    120121    accel_z_range4_maximum = AccelerometerField('z', range=4, maximum=True) 
    121122 
     123 
    122124ds_pool.register(KoruzaMonitor, KoruzaMonitorStreams) 
     125 
  • nodewatcher/extra/irnas/sfp/models.py

    r58cdc60c9e24 re388fa5d58e5  
    5151        multiple = True 
    5252 
     53 
    5354registration.point('node.monitoring').register_item(SFPMonitor) 
    5455 
     
    441442        return tags 
    442443 
     444 
    443445ds_pool.register(SFPMonitor, SFPMonitorStreams) 
    444446 
  • nodewatcher/extra/irnas/testnet/forms.py

    rb1e7f6b29d77 re388fa5d58e5  
    2828            state.update_item(general_config, platform=DEFAULT_PLATFORM) 
    2929 
     30 
    3031registration.point('node.config').add_form_defaults(DefaultPlatform()) 
    3132 
     
    4344        elif not type_config.type: 
    4445            state.update_item(type_config, type=DEFAULT_NODE_TYPE) 
     46 
    4547 
    4648registration.point('node.config').add_form_defaults(DefaultType()) 
     
    7072                state.update_item(project_config, project=testnet_project) 
    7173 
     74 
    7275registration.point('node.config').add_form_defaults(DefaultProject()) 
    7376 
     
    8083        else: 
    8184            state.update_item(telemetry_config, source='push') 
     85 
    8286 
    8387registration.point('node.config').add_form_defaults(DefaultTelemetrySource()) 
     
    98102                password=crypto.get_random_string(), 
    99103            ) 
     104 
    100105 
    101106registration.point('node.config').add_form_defaults(DefaultPassword()) 
     
    128133            prefix_length=28, 
    129134        ) 
     135 
    130136 
    131137registration.point('node.config').add_form_defaults(DefaultRouterID()) 
     
    368374        return self.setup_item(state, 'core.interfaces.network', klass, configuration, annotations, parent=interface, **filter) 
    369375 
     376 
    370377registration.point('node.config').add_form_defaults(NetworkConfiguration()) 
    371378 
     
    391398                state.update_item(radio, channel='') 
    392399 
     400 
    393401registration.point('node.config').add_form_defaults(STAChannelAutoselect()) 
    394402 
     
    434442        return dns_models.DnsServer.objects.filter(query) 
    435443 
     444 
    436445registration.point('node.config').add_form_defaults(DnsServers()) 
     446 
  • nodewatcher/settings.py

    r23fc1bd65238 re388fa5d58e5  
    202202    from django.core import urlresolvers 
    203203    return urlresolvers.reverse('AccountsComponent:user_page', kwargs={'username': user.username}) 
     204 
    204205 
    205206ABSOLUTE_URL_OVERRIDES = { 
Note: See TracChangeset for help on using the changeset viewer.