me
/
guix
Archived
1
0
Fork 0
Code

tests: Replace uses of deprecated 'static-networking-service'. 

* gnu/tests/ganeti.scm (%ganeti-os): Replace call to
'static-networking-service' by instantiating
STATIC-NETWORKING-SERVICE-TYPE.
* gnu/tests/networking.scm (%test-static-networking)
(%openvswitch-os, %dhcpd-os): Likewise.
master
Ludovic Courtès 2021-10-27 12:29:56 +02:00
parent 5967aee398
commit f73ba627ab
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/tests/ganeti.scm
View File

@ -59,11 +59,8 @@
(packages (append (list ganeti-instance-debootstrap ganeti-instance-guix) (packages (append (list ganeti-instance-debootstrap ganeti-instance-guix)
%base-packages)) %base-packages))
(services (services
(append (list (static-networking-service "eth0" "10.0.2.15" (append (list (service static-networking-service-type
#:netmask "255.255.255.0" (list %qemu-static-networking))
#:gateway "10.0.2.2"
#:name-servers '("10.0.2.3"))
(service openssh-service-type (service openssh-service-type
(openssh-configuration (openssh-configuration
(permit-root-login 'prohibit-password))) (permit-root-login 'prohibit-password)))

29
gnu/tests/networking.scm
View File

@ -122,10 +122,8 @@
(value (value
(let ((os (marionette-operating-system (let ((os (marionette-operating-system
(simple-operating-system (simple-operating-system
(static-networking-service "eth0" "10.0.2.15" (service static-networking-service-type
#:netmask "255.255.255.0" (list %qemu-static-networking)))
#:gateway "10.0.2.2"
#:name-servers '("10.0.2.2")))
#:imported-modules '((gnu services herd) #:imported-modules '((gnu services herd)
(guix combinators))))) (guix combinators)))))
(run-static-networking-test (virtual-machine os)))))) (run-static-networking-test (virtual-machine os))))))
@ -275,9 +273,13 @@ port 7, and a dict service on port 2628."
(define %openvswitch-os (define %openvswitch-os
(operating-system (operating-system
(inherit (simple-operating-system (inherit (simple-operating-system
(static-networking-service "ovs0" "10.1.1.1" (simple-service 'openswitch-networking
#:netmask "255.255.255.252" static-networking-service-type
#:requirement '(openvswitch-configuration)) (list (static-networking
(addresses (list (network-address
(value "10.1.1.1/24")
(device "ovs0"))))
(requirement '(openvswitch-configuration)))))
(service openvswitch-service-type) (service openvswitch-service-type)
openvswitch-configuration-service)) openvswitch-configuration-service))
;; Ensure the interface name does not change depending on the driver. ;; Ensure the interface name does not change depending on the driver.
@ -392,10 +394,15 @@ subnet 192.168.1.0 netmask 255.255.255.0 {
(define %dhcpd-os (define %dhcpd-os
(simple-operating-system (simple-operating-system
(static-networking-service "ens3" "192.168.1.4" (service static-networking-service-type
#:netmask "255.255.255.0" (list (static-networking
#:gateway "192.168.1.1" (addresses (list (network-address
#:name-servers '("192.168.1.2" "192.168.1.3")) (value "192.168.1.4/24")
(device "ens3"))))
(routes (list (network-route
(destination "default")
(gateway "192.168.1.1"))))
(name-servers '("192.168.1.2" "192.168.1.3")))))
(service dhcpd-service-type dhcpd-v4-configuration))) (service dhcpd-service-type dhcpd-v4-configuration)))
(define (run-dhcpd-test) (define (run-dhcpd-test)