Added HTTP server. Updated TFTP server to support 32MB+ files. Better Juniper support, it now fetches config on each boot.

Author: Zmegolaz

config-sample.py

@@ -118,8 +118,7 @@ def generate(switch, model_id):
   # Template function definition
   #
   cfg = tempita.Template(file(model.template).read())
-  return \
-      cfg.substitute(
+  cfg_subbed = cfg.substitute(
             hostname=switch,
             model=model,
             mgmt_ip=mgmt['ip'],
@@ -140,6 +139,20 @@ def generate(switch, model_id):
 #           snmp_auth=config.snmp_auth,
 #           snmp_priv=config.snmp_priv
             )
+  # We make the Juniper config a script, to be able to add the crontab.
+  if model_id[:7] == "Juniper":
+    cfg_subbed = '''#!/bin/sh
+echo "" > /tmp/dhtech.config
+fullconfig=$(cat << "ENDOFCONFIG"
+''' + cfg_subbed + '''
+ENDOFCONFIG
+)
+echo "$fullconfig" >> /tmp/dhtech.config
+echo '@reboot sleep 30; cli -c "configure private;set chassis auto-image-upgrade;commit"' > /tmp/dhtech.cron
+crontab /tmp/dhtech.cron
+cli -c "configure private;delete;load merge /tmp/dhtech.config;commit"
+'''
+  return cfg_subbed
 
 def parse_metadata(switch):
   sql = '''SELECT n_mgmt.ipv4_txt, h.ipv4_addr_txt, n_mgmt.ipv4_gateway_txt, 

dhcpd.conf

@@ -34,12 +34,16 @@ on commit {
 option space JUNIPER;
 option JUNIPER.image-file-name code 0 = text;
 option JUNIPER.config-file-name code 1 = text;
+option JUNIPER.transfer-mode code 3 = text;
 option JUNIPER-encapsulation code 43 = encapsulate JUNIPER;
 option option-150 code 150 = ip-address;
 
 option OPTION-150 192.168.40.10;
 option JUNIPER.config-file-name "juniper-confg";
-option JUNIPER.image-file-name "juniper.tgz";
+# Enable this to auto upgrade switches. Read this first though:
+# https://www.reddit.com/r/Juniper/comments/ctgoyh/ex3400_ztp_storage_issues/
+#option JUNIPER.image-file-name "juniper.tgz";
+option JUNIPER.transfer-mode "http";
 
 class "cisco-switch" {
   match if (substring (option dhcp-client-identifier, 1, 5) = "cisco") or

swhttpd.py

@@ -0,0 +1,86 @@
+#!/usr/bin/env python
+import sys, logging
+import redis
+import syslog
+import socket
+import re
+import tempfile
+import SimpleHTTPServer
+import SocketServer
+import time
+
+import config
+
+def log(*args):
+  print time.strftime("%Y-%m-%d %H:%M:%S") + ':', ' '.join(args)
+  syslog.syslog(syslog.LOG_INFO, ' '.join(args))
+
+def error(*args):
+  print time.strftime("%Y-%m-%d %H:%M:%S") + ': ERROR:', ' '.join(args)
+  syslog.syslog(syslog.LOG_ERR, ' '.join(args))
+
+class swbootHttpHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+  def do_GET(self):
+    db = redis.Redis()
+    switch = db.get(self.client_address[0])
+    model = db.get('client-{}'.format(self.client_address[0]))
+    if switch == None or model == None:
+      log("Switch not found:", self.client_address[0])
+      self.send_error(404, "File not found")
+      return None
+    if self.path == "/juniper-confg":
+      log("Generating Juniper config for",
+          self.client_address[0], "name =", switch)
+      f = tempfile.TemporaryFile()
+      f.write(config.generate(switch, model))
+      content_length = f.tell()
+      f.seek(0)
+
+      self.send_response(200)
+      self.send_header("Content-type", "application/octet-stream")
+      self.send_header("Content-Length", content_length)
+      self.end_headers()
+      self.copyfile(f, self.wfile)
+      log("Config sent to", self.client_address[0], "name =", switch)
+
+      f.close()
+      return
+    elif self.path == "/juniper.tgz":
+      log("Sending JunOS file", config.models[model]['image'], "to",
+        self.client_address[0], "name =", switch)
+      if (model in config.models) and ('image' in config.models[model]):
+        self.path = config.models[model]['image']
+        f = self.send_head()
+        if f:
+          self.copyfile(f, self.wfile)
+          log("Sent JunOS to", self.client_address[0], "name =", switch)
+          f.close()
+    else:
+      log("Unknown file:", self.path)
+      self.send_error(404, "File not found")
+  
+  # We write our own logs.
+  def log_request(self, code='-', size='-'):
+    pass
+  def log_error(self, format, *args):
+    pass
+
+class swbootTCPServer(SocketServer.ForkingTCPServer):
+  def server_bind(self):
+    self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    self.socket.bind(self.server_address)
+
+log("swhttpd started")
+
+try:
+  httpd = swbootTCPServer(("0.0.0.0", 80), swbootHttpHandler)
+  httpd.serve_forever()
+except socket.error, err:
+  sys.stderr.write("Socket error: %s\n" % str(err))
+  sys.exit(1)
+except KeyboardInterrupt:
+  sys.stderr.write("\n")
+except:
+  sys.stderr.write('Something went wrong: %2' % sys.exc_info()[0])
+
+

switchconfig/config-example.yaml

@@ -33,11 +33,11 @@ models:
   - name: "Juniper-ex3400-24t"
     path: "/scripts/swboot/switchconfig/ex3400.cfg"
     ports: 24
-    image: "/scripts/swboot/junos/junos-arm-32-19.3R1.8.tgz"
+    image: "junos/junos-arm-32-19.3R1.8.tgz"
   - name: "Juniper-ex3400-48t"
     path: "/scripts/swboot/switchconfig/ex3400.cfg"
     ports: 48
-    image: "/scripts/swboot/junos/junos-arm-32-19.3R1.8.tgz"
+    image: "junos/junos-arm-32-19.3R1.8.tgz"
 
 static_files:
   - c2950.bin: "/scripts/swboot/ios/c2950-i6k2l2q4-mz.121-22.EA14.bin"

swtftpd.py

@@ -8,17 +8,18 @@
 import traceback
 import re
 import os
+import time
 
 import config
 
 db = redis.Redis()
 
 def log(*args):
-  print ' '.join(args)
+  print time.strftime("%Y-%m-%d %H:%M:%S") + ':', ' '.join(args)
   syslog.syslog(syslog.LOG_INFO, ' '.join(args))
 
 def error(*args):
-  print 'ERROR:', ' '.join(args)
+  print time.strftime("%Y-%m-%d %H:%M:%S") + ': ERROR:', ' '.join(args)
   syslog.syslog(syslog.LOG_ERR, ' '.join(args))
 
 def sw_reload(ip):
@@ -94,17 +95,16 @@ def resolve_option82(relay, option82):
         '.1.3.6.1.4.1.9.2.2.1.1.28.%d' % int(iface))
       return snmpv3_command(var, relay, netsnmp.snmpget)[0][6:]
 
-def file_callback(context):
-  if context.file_to_transfer in config.static_files:
-    return file(config.static_files[context.file_to_transfer])
+def file_callback(file_to_transfer, ip, rport):
+  if file_to_transfer in config.static_files:
+    return file(config.static_files[file_to_transfer])
 
   global db
-  option82 = db.get(context.host)
+  option82 = db.get(ip)
   if option82 is None:
-    error('No record of switch', context.host, 'in Redis, ignoring ..')
+    error('No record of switch', ip, 'in Redis, ignoring ..')
     return None
 
-  ip = context.host
   # If we do not have any franken switches, do not execute this horrible code path
   if not config.franken_net_switches:
     switch = option82
@@ -132,17 +132,17 @@ def file_callback(context):
   print 'Switch is "%s"' % switch
   db.set('switchname-%s' % ip, switch)
 
-  if (context.file_to_transfer == "network-confg" or
-      context.file_to_transfer == "Switch-confg"):
+  if (file_to_transfer == "network-confg" or
+      file_to_transfer == "Switch-confg"):
     f = tempfile.TemporaryFile()
-    log("Generating base config", context.file_to_transfer,
-        "for", context.host,"config =", switch)
+    log("Generating base config", file_to_transfer,
+        "for", ip,"config =", switch)
     base(f, switch)
     f.seek(0)
     return f
 
-  if context.file_to_transfer == "juniper.tgz":
-    model = db.get('client-{}'.format(context.host))
+  if file_to_transfer == "juniper.tgz":
+    model = db.get('client-{}'.format(ip))
     if (model in config.models) and ('image' in config.models[model]):
       return file(config.models[model]['image'])
 
@@ -152,27 +152,27 @@ def file_callback(context):
     return None
 
   f = tempfile.TemporaryFile()
-  if context.file_to_transfer.lower().endswith("-confg"):
+  if file_to_transfer.lower().endswith("-confg"):
     log("Generating config for", ip,"config =", switch)
     if generate(f, ip, switch) == None:
       return None
   else:
     error("Switch", ip, "config =", switch, "tried to get file",
-        context.file_to_transfer)
+        file_to_transfer)
     f.close()
     return None
 
   f.seek(0)
   return f
 
 log("swtftpd started")
-tftpy.setLogLevel(logging.WARNING)
-server = tftpy.TftpServer(file_callback)
+server = tftpy.TftpServer('/scripts/swboot/ios', file_callback)
+tftplog = logging.getLogger('tftpy.TftpClient')
+tftplog.setLevel(logging.WARN)
 try:
   server.listen("192.168.40.10", 69)
 except tftpy.TftpException, err:
   sys.stderr.write("%s\n" % str(err))
   sys.exit(1)
 except KeyboardInterrupt:
-  pass
-
+  sys.stderr.write("\n")

tftpy/README

@@ -1,5 +1,25 @@
 Copyright, Michael P. Soulier, 2010.
 
+About Release 0.8.0:
+====================
+This version introduces Python 3.X support.
+And there was much rejoicing.
+
+About Release 0.7.0:
+====================
+Various bugfixes and refactoring for improved logging.
+Now requiring python 2.7+ and tightening syntax in
+preparation for supporting python 3.
+
+About Release 0.6.2:
+====================
+Maintenance release to fix a couple of reported issues.
+
+About Release 0.6.1:
+====================
+Maintenance release to fix several reported problems, including a rollover
+at 2^16 blocks, and some contributed work on dynamic file objects.
+
 About Release 0.6.0:
 ====================
 Maintenance update to fix several reported issues, including proper
@@ -85,7 +105,7 @@ easy inclusion in a UI for populating progress indicators. It supports RFCs
 
 Dependencies:
 -------------
-Python 2.3+, hopefully. Let me know if it fails to work.
+Python 2.7+, hopefully. Let me know if it fails to work.
 
 Trifles:
 --------

tftpy/TftpClient.py

@@ -1,29 +1,36 @@
+# vim: ts=4 sw=4 et ai:
+# -*- coding: utf8 -*-
 """This module implements the TFTP Client functionality. Instantiate an
 instance of the client, and then use its upload or download method. Logging is
 performed via a standard logging object set in TftpShared."""
 
+
 import types
-from TftpShared import *
-from TftpPacketTypes import *
-from TftpContexts import TftpContextClientDownload, TftpContextClientUpload
+import logging
+from .TftpShared import *
+from .TftpPacketTypes import *
+from .TftpContexts import TftpContextClientDownload, TftpContextClientUpload
+
+log = logging.getLogger('tftpy.TftpClient')
 
 class TftpClient(TftpSession):
     """This class is an implementation of a tftp client. Once instantiated, a
     download can be initiated via the download() method, or an upload via the
     upload() method."""
 
-    def __init__(self, host, port, options={}):
+    def __init__(self, host, port=69, options={}, localip = ""):
         TftpSession.__init__(self)
         self.context = None
         self.host = host
         self.iport = port
         self.filename = None
         self.options = options
-        if self.options.has_key('blksize'):
+        self.localip = localip
+        if 'blksize' in self.options:
             size = self.options['blksize']
-            tftpassert(types.IntType == type(size), "blksize must be an int")
+            tftpassert(int == type(size), "blksize must be an int")
             if size < MIN_BLKSIZE or size > MAX_BLKSIZE:
-                raise TftpException, "Invalid blksize: %d" % size
+                raise TftpException("Invalid blksize: %d" % size)
 
     def download(self, filename, output, packethook=None, timeout=SOCK_TIMEOUT):
         """This method initiates a tftp download from the configured remote
@@ -38,17 +45,16 @@ def download(self, filename, output, packethook=None, timeout=SOCK_TIMEOUT):
         Note: If output is a hyphen, stdout is used."""
         # We're downloading.
         log.debug("Creating download context with the following params:")
-        log.debug("host = %s, port = %s, filename = %s, output = %s"
-            % (self.host, self.iport, filename, output))
-        log.debug("options = %s, packethook = %s, timeout = %s"
-            % (self.options, packethook, timeout))
+        log.debug("host = %s, port = %s, filename = %s" % (self.host, self.iport, filename))
+        log.debug("options = %s, packethook = %s, timeout = %s" % (self.options, packethook, timeout))
         self.context = TftpContextClientDownload(self.host,
                                                  self.iport,
                                                  filename,
                                                  output,
                                                  self.options,
                                                  packethook,
-                                                 timeout)
+                                                 timeout,
+                                                 localip = self.localip)
         self.context.start()
         # Download happens here
         self.context.end()
@@ -82,7 +88,8 @@ def upload(self, filename, input, packethook=None, timeout=SOCK_TIMEOUT):
                                                input,
                                                self.options,
                                                packethook,
-                                               timeout)
+                                               timeout,
+                                               localip = self.localip)
         self.context.start()
         # Upload happens here
         self.context.end()