sipwise
/
ngcpcfg
mirror of https://github.com/sipwise/ngcpcfg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#49058 Update template of /e/network/interfaces to the latest vers., for tests

Browse Source 
These lines have to be commented out, the script/helper is not present during
tests:

  #PROCESS '/usr/lib/ngcp-ngcpcfg/get_ngcp_version';
  #ngcp_version = out;

Change-Id: I9665f205baf1e28ed2a96e8ab01f0f8f80b838ac
changes/61/25961/3
Manuel Montecelo 8 years ago
parent 42979610ad
commit d7d048902b
2 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File

11
t/fixtures/output/network_interfaces
Unescape View File

@ -14,13 +14,14 @@ iface eth22 inet manual
# bond0 ----------------------
auto bond0
iface bond0 inet manual
bond-slaves eth11 eth22
bond-mode active-backup
bond-miimon 100
iface bond0 inet static
address 10.10.10.2
netmask 255.0.0.0
gateway 10.10.10.254
bond-slaves eth11 eth22
bond-mode active-backup
bond-miimon 100
# --------------------------------------------
# lo ----------------------
@ -35,13 +36,13 @@ iface eth46 inet static
address 127.11.22.33
netmask 255.0.0.0
gateway 127.11.22.254
hwaddress c0:ff:ee:15:90:0d
# skipped hwaddress since it is not supported by NGCP version
#hwaddress c0:ff:ee:15:90:0d
dns-nameservers 127.0.0.1 1.1.1.1
iface eth46 inet6 static
address 2001:aaaa:1111:bbbb:2222:cccc:3333:dddd
netmask 64
gateway 2001:aaaa:1111:bbbb:2222:cccc:3333:0001
hwaddress c0:ff:ee:15:90:0d
dns-nameservers ::1 2606:4700:4700::1111
# --------------------------------------------

61
t/fixtures/repos/templates/etc/network/interfaces.tt2
Unescape View File

@ -3,11 +3,19 @@
[%
hostname = ngcp.get_hostname();
#PROCESS '/usr/lib/ngcp-ngcpcfg/get_ngcp_version';
#ngcp_version = out;
# in SPCE there's no proper hostname, but "self", default to it
UNLESS hosts.${hostname};
hostname = 'self';
END;
# array to track which options were already printed (to avoid reprinting when
# there are several stanzas of the interface, e.g. ipv4+ipv6 with manual common
# set-up for bonding options)
hardware_options_printed = [ ];
MACRO print_start_interface BLOCK;
"# ${interface} ----------------------\n";
"auto ${interface}\n";
@ -38,13 +46,14 @@ MACRO print_bond_fields BLOCK;
" bond-downdelay ${iface.bond_downdelay}\n";
END;
IF iface.bond_xmit_hash_policy;
" bond-xmit-hash-policy ${iface.bond_xmit_hash_policy}\n";
" bond-xmit_hash_policy ${iface.bond_xmit_hash_policy}\n";
END;
END;
MACRO print_hwaddress BLOCK;
IF iface.hwaddr;
" hwaddress ${iface.hwaddr}\n";
IF iface.hwaddr and iface.hwaddr != '00:00:00:00:00:00';
" # skipped hwaddress since it is not supported by NGCP version ${ngcp_version}\n";
" #hwaddress ${iface.hwaddr}\n";
END;
END;
@ -59,8 +68,20 @@ MACRO print_mtu BLOCK;
END;
MACRO print_hardware_options BLOCK;
print_hwaddress;
print_mtu;
found='no';
FOREACH i IN hardware_options_printed;
IF i == iface_name;
# " # hw options already printed for interface ${i} == ${iface_name}\n";
found='yes';
LAST;
END;
END;
UNLESS found == 'yes';
hardware_options_printed.push(iface_name);
print_hwaddress;
print_mtu;
END;
END;
MACRO print_address_v4 BLOCK;
@ -210,10 +231,18 @@ MACRO print_interface BLOCK;
"iface ${interface} inet6 loopback\n";
ELSE;
# print bond fields of bond interfaces separately, to happen only once
# even when ipv4 and ipv6 are used at the same time
IF interface.match('^bond[0-9]+$');
"iface ${interface} inet manual\n";
print_bond_fields(iface=iface);
print_hardware_options(iface=iface, iface_name=interface);
END;
# ipv4
IF iface.manual == 'yes';
"iface ${interface} inet manual\n";
print_hardware_options(iface=iface);
print_hardware_options(iface=iface, iface_name=interface);
print_up_down_v4(iface=iface);
ELSIF iface.dhcp == 'yes';
"iface ${interface} inet dhcp\n";
@ -222,6 +251,12 @@ MACRO print_interface BLOCK;
print_address_v4(iface=iface);
print_netmask_v4(iface=iface);
print_gateway_v4(iface=iface);
ELSIF interface.match('^bond[0-9]+$');
# default for some installations in Carrier when bonds don't have any
# ip=IP/dhcp=yes configuration, and "manual" is not mandatory
"iface ${interface} inet manual\n";
print_hardware_options(iface=iface, iface_name=interface);
print_up_down_v4(iface=iface);
ELSE;
ipv4=no;
END;
@ -229,8 +264,7 @@ MACRO print_interface BLOCK;
# ipv4-related fields
IF iface.ip or iface.dhcp == 'yes';
# common, they can be attached to any protocol of the interface
print_hardware_options(iface=iface);
print_bond_fields(iface=iface);
print_hardware_options(iface=iface, iface_name=interface);
print_vlan_raw_device(iface=iface);
print_dns_nameservers_v4(iface=iface);
@ -240,7 +274,7 @@ MACRO print_interface BLOCK;
# ipv6
IF iface.v6manual == 'yes';
"iface ${interface} inet6 manual\n";
print_hardware_options(iface=iface);
print_hardware_options(iface=iface, iface_name=interface);
print_up_down_v6(iface=iface);
ELSIF iface.v6dhcp == 'yes';
"iface ${interface} inet6 dhcp\n";
@ -256,8 +290,7 @@ MACRO print_interface BLOCK;
# ipv6-related fields
IF iface.v6ip or iface.v6dhcp == 'yes';
# common, they can be attached to any protocol of the interface
print_hardware_options(iface=iface);
print_bond_fields(iface=iface);
print_hardware_options(iface=iface, iface_name=interface);
print_vlan_raw_device(iface=iface);
print_dns_nameservers_v6(iface=iface);
@ -265,7 +298,7 @@ MACRO print_interface BLOCK;
END;
# disable "Duplicate Address Detection", it creates problems with HA resource transfer
IF iface.shared_v6ip;
IF iface.shared_v6ip.size;
" dad-attempts 0\n";
" pre-up echo 0 > /proc/sys/net/ipv6/conf/${interface}/accept_dad\n";
END;
@ -296,8 +329,8 @@ FOREACH interface IN all_interfaces;
print_start_interface(interface=phys_interface);
"iface ${phys_interface} inet manual\n";
" pre-up ethtool -K ${phys_interface} sg off\n";
print_hardware_options(iface=iface);
print_up_down_v4(iface=iface);
print_hardware_options(iface=phys_interface, iface_name=phys_interface);
print_up_down_v4(iface=phys_interface);
print_end_interface();
# remove now to not process again, but lists do not allow to remove

Write Preview
Loading…
Cancel
Save