code/whitespace cleanup

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/Network/SDN/Controllers.pm b/PVE/Network/SDN/Controllers.pm
index d61851b6750f5c8f78dfdc4abe2261c1f556d642..e1cf9e0f5d193b4725e136d0e57a653f1fa602b1 100644 (file)
--- a/PVE/Network/SDN/Controllers.pm
+++ b/PVE/Network/SDN/Controllers.pm
@@ -83,7 +83,7 @@ sub generate_controller_config {
     my $interfaces_config = PVE::INotify::read_etc_network_interfaces(1,$fh);
     $fh->close();
 
-    #check uplinks
+    # check uplinks
     my $uplinks = {};
     foreach my $id (keys %{$interfaces_config->{ifaces}}) {
        my $interface = $interfaces_config->{ifaces}->{$id};
@@ -94,7 +94,7 @@ sub generate_controller_config {
        }
     }
 
-    #generate configuration
+    # generate configuration
     my $config = {};
 
     foreach my $id (sort keys %{$controller_cfg->{ids}}) {

diff --git a/PVE/Network/SDN/Zones.pm b/PVE/Network/SDN/Zones.pm
index e5c0240e2be7de919ac1ec3fe99bffa59add0939..1ccceed89d4bd7754d7f3d8cc673a01b306633d3 100644 (file)
--- a/PVE/Network/SDN/Zones.pm
+++ b/PVE/Network/SDN/Zones.pm
@@ -227,7 +227,6 @@ sub status {
 
     my $status = ifquery_check();
 
-    
     my $vnet_cfg = $cfg->{vnets};
     my $zone_cfg = $cfg->{zones};
     my $nodename = PVE::INotify::nodename();

diff --git a/test/run_test_zones.pl b/test/run_test_zones.pl
index a788553c052512be50ff7a55e45abce928e9c4ad..12e017a9cd1b76dfcbff2b0a59282a7af183b595 100755 (executable)
--- a/test/run_test_zones.pl
+++ b/test/run_test_zones.pl
@@ -21,7 +21,7 @@ sub read_sdn_config {
     open my $in, '<', $file or die $!;
     my $sdn_config;
     {
-       local $/;    # slurp mode
+       local $/; # slurp mode
        $sdn_config = eval <$in>;
     }
     close $in;
@@ -92,7 +92,7 @@ foreach my $test (@tests) {
     my $expected = read_file("./$test/expected_sdn_interfaces");
 
     my $result = "";
-    eval { 
+    eval {
        $result = PVE::Network::SDN::Zones::generate_etc_network_config();
     };
 
@@ -106,11 +106,10 @@ foreach my $test (@tests) {
        my $expected = read_file("./$test/expected_controller_config");
        my $controller_rawconfig = "";
 
-       eval { 
+       eval {
            my $config = PVE::Network::SDN::Controllers::generate_controller_config();
            $controller_rawconfig = PVE::Network::SDN::Controllers::generate_controller_rawconfig($config);
        };
-
        if (my $err = $@) {
            fail($name);
        } else {

diff --git a/test/zones/evpn/ebgp/sdn_config b/test/zones/evpn/ebgp/sdn_config
index 91c1b613f889a29b3583788d05d2aaf6ec0a0ed4..6e9d116fa4c30cc41f2e1445e7a4eb65aad6384d 100644 (file)
--- a/test/zones/evpn/ebgp/sdn_config
+++ b/test/zones/evpn/ebgp/sdn_config
@@ -1,29 +1,50 @@
 {
-  version => 1,
-  vnets   => {
-               ids => {
-                        myvnet => { tag => "100", type => "vnet", zone => "myzone" },
-                      },
-             },
+    version => 1,
+    vnets => {
+        ids => {
+            myvnet => {
+                tag => "100",
+                type => "vnet",
+                zone => "myzone",
+            },
+        },
+    },
 
-  zones   => {
-               ids => { myzone => { ipam => "pve", type => "evpn", controller => "evpnctl", 'vrf-vxlan' => 1000 } },
-             },
-  controllers  => {
-               ids => { 
-                       evpnctl => { type => "evpn", 'peers' => '192.168.0.1,192.168.0.2,192.168.0.3', asn => "65000" },
-                       localhost => { type => "bgp", 'peers' => '192.168.0.252,192.168.0.253', ebgp => "1", 'ebgp-multihop' => '3', asn => "65001", node => "localhost" },
-                     },
-             },
+    zones   => {
+        ids => {
+            myzone => {
+                ipam => "pve",
+                type => "evpn",
+                controller => "evpnctl",
+                'vrf-vxlan' => 1000,
+            },
+        },
+    },
+    controllers  => {
+        ids => {
+            evpnctl => {
+                type => "evpn",
+                'peers' => '192.168.0.1,192.168.0.2,192.168.0.3',
+                asn => "65000",
+            },
+            localhost => {
+                type => "bgp",
+                'peers' => '192.168.0.252,192.168.0.253',
+                ebgp => "1",
+                'ebgp-multihop' => '3',
+                asn => "65001",
+                node => "localhost",
+            },
+        },
+    },
 
-  subnets => {
-              ids => { 'myzone-10.0.0.0-24' => {
-                                                       'type' => 'subnet',
-                                                       'vnet' => 'myvnet',
-                                                       'gateway' => '10.0.0.1',
-                                                 }
-                    }
-            }
+    subnets => {
+        ids => {
+            'myzone-10.0.0.0-24' => {
+                'type' => 'subnet',
+                'vnet' => 'myvnet',
+                'gateway' => '10.0.0.1',
+            },
+        },
+    },
 }
-
-