fixed issues with setup view: options order mixed; settings.py.dist needs to...

fixed issues with setup view: options order mixed; settings.py.dist needs to include settings_local import for working docker settings defaults

flowspec/views.py

@@ -941,9 +941,9 @@ def setup(request):
 
                 with open("flowspy/settings_local.py", "a") as f:
                     f.write("NETCONF_DEVICE = \"%s\"\n" % form.cleaned_data["netconf_device"])
-                    f.write("NETCONF_USER = \"%s\"\n"   % form.cleaned_data["netconf_port"])
-                    f.write("NETCONF_PASS = \"%s\"\n"   % form.cleaned_data["netconf_user"])
-                    f.write("NETCONF_PORT = %s\n"       % form.cleaned_data["netconf_pass"])
+                    f.write("NETCONF_USER = \"%s\"\n"   % form.cleaned_data["netconf_user"])
+                    f.write("NETCONF_PASS = \"%s\"\n"   % form.cleaned_data["netconf_pass"])
+                    f.write("NETCONF_PORT = %s\n"       % form.cleaned_data["netconf_port"])
 
                 logger.error('TODO REMOVE: password: %s' % form.cleaned_data["password"])
                 return HttpResponseRedirect(reverse("welcome"))

flowspy/settings.py.dist

@@ -469,3 +469,14 @@ STATISTICS_PER_RULE__ADD_INITIAL_ZERO = True
 ##############################################################################
 ##############################################################################
 
+#MYSETTING1="default"
+#from settings_local import *
+from flowspy.settings_local import *
+
+#print "MYSETTING1="+MYSETTING1
+#print("MYSETTING1="+MYSETTING1, file=sys.stderr)
+#print "debug settings.NOTIFY_ADMIN_MAILS="+str(NOTIFY_ADMIN_MAILS)
+
+##############################################################################
+##############################################################################
+