install: make <admin-interface> explicit

- adding it behind the scene makes it more difficult to write tests for IPv6
- only needed for install, not upgrade or restore

Signed-off-by: Yann Dirson <[email protected]>

Author: ydirson

tests/install/conftest.py

@@ -68,13 +68,6 @@ def answerfile(request):
     answerfile_def = callable_marker(marker.args[0], request)
     assert isinstance(answerfile_def, AnswerFile)
 
-    answerfile_def.top_append(
-        dict(TAG="admin-interface",
-             name="eth0",
-             proto="dhcp",
-             ),
-    )
-
     yield answerfile_def
 
 

tests/install/test.py

@@ -85,6 +85,7 @@ class TestNested:
              "net": {"TAG": "source", "type": "url",
                      "CONTENTS": ISO_IMAGES[iso_version]['net-url']},
              }[package_source],
+            {"TAG": "admin-interface", "name": "eth0", "proto": "dhcp"},
             {"TAG": "primary-disk",
              "guest-storage": "no" if local_sr == "nosr" else "yes",
              "CONTENTS": install_disk},