container: T4959: add registry authentication option

Container registry CLI node changed from leafNode to tagNode with the same
defaults. In addition we can now configure an authentication option per
registry.

4 files changed, 38 insertions, 29 deletions

diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in
index a5940ae17..6947ed500 100644
--- a/interface-definitions/container.xml.in
+++ b/interface-definitions/container.xml.in
@@ -368,13 +368,16 @@
           </leafNode>
         </children>
       </tagNode>
-      <leafNode name="registry">
+      <tagNode name="registry">
         <properties>
           <help>Registry Name</help>
-          <multi/>
         </properties>
         <defaultValue>docker.io quay.io</defaultValue>
-      </leafNode>
+        <children>
+          #include <include/interface/authentication.xml.i>
+          #include <include/generic-disable-node.xml.i>
+        </children>
+      </tagNode>
     </children>
   </node>
 </interfaceDefinition>
diff --git a/interface-definitions/include/generic-password.xml.i b/interface-definitions/include/generic-password.xml.i
new file mode 100644
index 000000000..76d5f12d8
--- /dev/null
+++ b/interface-definitions/include/generic-password.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from generic-password.xml.i -->
+<leafNode name="password">
+  <properties>
+    <help>Password used for authentication</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Password</description>
+    </valueHelp>
+    <constraint>
+      <regex>[[:ascii:]]{1,128}</regex>
+    </constraint>
+    <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/generic-username.xml.i b/interface-definitions/include/generic-username.xml.i
new file mode 100644
index 000000000..678f30ddf
--- /dev/null
+++ b/interface-definitions/include/generic-username.xml.i
@@ -0,0 +1,15 @@
+<!-- include start from generic-username.xml.i -->
+<leafNode name="username">
+  <properties>
+    <help>Username used for authentication</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Username</description>
+    </valueHelp>
+    <constraint>
+      <regex>[[:ascii:]]{1,128}</regex>
+    </constraint>
+    <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/include/interface/authentication.xml.i b/interface-definitions/include/interface/authentication.xml.i
index ac06faef5..0bd792209 100644
--- a/interface-definitions/include/interface/authentication.xml.i
+++ b/interface-definitions/include/interface/authentication.xml.i
@@ -4,32 +4,8 @@
     <help>Authentication settings</help>
   </properties>
   <children>
-    <leafNode name="username">
-      <properties>
-        <help>Username used for authentication</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Username</description>
-        </valueHelp>
-        <constraint>
-          <regex>[[:ascii:]]{1,128}</regex>
-        </constraint>
-        <constraintErrorMessage>Username is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
-      </properties>
-    </leafNode>
-    <leafNode name="password">
-      <properties>
-        <help>Password used for authentication</help>
-        <valueHelp>
-          <format>txt</format>
-          <description>Password</description>
-        </valueHelp>
-        <constraint>
-          <regex>[[:ascii:]]{1,128}</regex>
-        </constraint>
-        <constraintErrorMessage>Password is limited to ASCII characters only, with a total length of 128</constraintErrorMessage>
-      </properties>
-    </leafNode>
+    #include <include/generic-username.xml.i>
+    #include <include/generic-password.xml.i>
   </children>
 </node>
 <!-- include end -->