make-secnet-sites: sort the properties

This makes the test suite less sensitive to python version.
Now it works with 2.7.13, 3.5.3.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/make-secnet-sites b/make-secnet-sites
index d7a849468cd9c7823cb1d781abdd05ade47b15e6..74b09bd2395092323204dccd59b50d83c7f8a900 100755 (executable)
--- a/make-secnet-sites
+++ b/make-secnet-sites
@@ -430,7 +430,8 @@ class level:
                w.write("%s {\n"%(self.kname()))
                self.output_props(w,ind+2)
                if self.depth==1: w.write("\n");
-               for c in self.children.values():
+               for k in sorted(self.children.keys()):
+                       c=self.children[k]
                        c.output_data(w,path+(c,))
                self.indent(w,ind)
                w.write("};\n")

diff --git a/mtest/e-basic.conf b/mtest/e-basic.conf
index 8718b570706dca13cabefa51572468bf6a987d32..6469d20b26ebc44e81bdc0540e427232bcb67715 100644 (file)
--- a/mtest/e-basic.conf
+++ b/mtest/e-basic.conf
@@ -1,6 +1,6 @@
 # secnet sites file autogenerated by make-secnet-sites version 0.1.18
-# Sun Oct 20 13:55:05 2019
-# Command line: ./make-secnet-sites test-example/sites ./mtest/d-basic/out.conf
+# Tue Nov 19 00:51:37 2019
+# Command line: ./make-secnet-sites --no-conf-key-prefix test-example/sites ./mtest/d-basic/out.conf
 
 vpn-data {
   test-example {
@@ -12,17 +12,6 @@ vpn-data {
     # Contact email address: <devnull@example.com>
     key-lifetime 72000000;
 
-    out {
-      outside {
-        name "test-example/out/outside";
-        key rsa-public("65537","129251483458784900555621175262818292872587807329014927540074484804119474262261383244074013537736576331652560727149001626325243856012659665194546933097292703586821422085819615124517093786704646988649444946154384037948502112302285511195679291084694375811092516151263088200304199780052361048758446082354317801941");
-        address "[::1]"; port 16900;
-        link netlink {
-          routes "172.18.232.0/29";
-          ptp-address "172.18.232.1";
-        };
-      };
-    };
     in {
       inside {
         name "test-example/in/inside";
@@ -35,6 +24,17 @@ vpn-data {
         };
       };
     };
+    out {
+      outside {
+        name "test-example/out/outside";
+        key rsa-public("65537","129251483458784900555621175262818292872587807329014927540074484804119474262261383244074013537736576331652560727149001626325243856012659665194546933097292703586821422085819615124517093786704646988649444946154384037948502112302285511195679291084694375811092516151263088200304199780052361048758446082354317801941");
+        address "[::1]"; port 16900;
+        link netlink {
+          routes "172.18.232.0/29";
+          ptp-address "172.18.232.1";
+        };
+      };
+    };
   };
 };
 vpn {