HPCC-9569 ConfigMgr - remove extra roxie info

Add 'Computer' column to server display table.

Fix regressions in xsd.

Move slave redundancy settings to 'Redundancy' tab.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>

deployment/deployutils/deployutils.cpp

@@ -502,7 +502,7 @@ public:
 
       void addRoxieMisc(StringBuffer& jsStrBuf)
       {
-        addItem(jsStrBuf, m_pEnv.get(), XML_TAG_ROXIE_SERVER, TAG_NAME, "", 0, 1, "", 0);
+        addItem(jsStrBuf, m_pEnv.get(), XML_TAG_ROXIE_SERVER, TAG_COMPUTER, "", 0, 1, "", 0);
         addItem(jsStrBuf, m_pEnv.get(), XML_TAG_ROXIE_SERVER, TAG_PROCESS, "", 0, 1, "", 0);
         addItem(jsStrBuf, m_pEnv.get(), XML_TAG_ROXIE_FARM, TAG_NAME, "", 0, 1, "", 0);
         addItem(jsStrBuf, m_pEnv.get(), XML_TAG_ROXIE_FARM, TAG_PROCESS, "", 0, 1, "", 0);
@@ -530,7 +530,7 @@ public:
           const char* serverStr = "Servers";
 
           short index = 0;
-          m_colIndex.appendf("colIndex['name%s']=%d;", serverStr, index++); 
+          m_colIndex.appendf("colIndex['computer%s']=%d;", serverStr, index++);
           m_colIndex.appendf("colIndex['process%s']=%d;", serverStr, index++);
           m_colIndex.appendf("colIndex['netAddress%s']=%d;", serverStr, index++);
           m_colIndex.appendf("colIndex['port%s']=%d;", serverStr, index++);
@@ -541,7 +541,7 @@ public:
 
           index = 0;
           const char* agentStr = "Agents";
-          m_colIndex.appendf("colIndex['name%s']=%d;", agentStr, index++); 
+          m_colIndex.appendf("colIndex['computer%s']=%d;", agentStr, index++);
           m_colIndex.appendf("colIndex['netAddress%s']=%d;", agentStr, index++);
         }
         else if (!strcmp(m_compName.str(), XML_TAG_THORCLUSTER))

esp/files/scripts/configmgr/configmgr.js

@@ -705,6 +705,9 @@ function initItemForRoxieServers(item) {
   item.name_extra = "";
   item.name_ctrlType = 0;
   item.parent = -1;
+  item.computer = "";
+  item.computer_extra = "";
+  item.computer_ctrlType = 0;
   item.netAddress = "";
   item.netAddress_extra = "";
   item.netAddress_ctrlType = 0;

initfiles/componentfiles/configxml/roxie.xsd.in

@@ -29,7 +29,7 @@
         <xs:element name="RoxieFarmProcess" maxOccurs="unbounded">
           <xs:annotation>
             <xs:appinfo>
-              <title>Servers</title>
+              <title>Ports</title>
             </xs:appinfo>
           </xs:annotation>
           <xs:complexType>
@@ -77,11 +77,19 @@
         <xs:element name="RoxieServerProcess" maxOccurs="unbounded">
           <xs:annotation>
             <xs:appinfo>
-              <title>Ports</title>
+              <viewType>RoxieServers</viewType>
+              <title>Servers</title>
             </xs:appinfo>
           </xs:annotation>
           <xs:complexType>
             <xs:attribute name="computer" type="computerType" use="required"/>
+            <xs:attribute name="netAddress" type="ipAddress">
+              <xs:annotation>
+                <xs:appinfo>
+                  <viewType>readonly</viewType>
+                </xs:appinfo>
+              </xs:annotation>
+            </xs:attribute>
           </xs:complexType>
         </xs:element>
 
@@ -373,6 +381,7 @@
       </xs:attribute>
       <xs:attributeGroup ref="LDAP"/>
       <xs:attributeGroup ref="Options"/>
+      <xs:attributeGroup ref="Redundancy"/>
       <xs:attributeGroup ref="Tracing"/>
       <xs:attributeGroup ref="UDP"/>
       <xs:attributeGroup ref="Cache"/>
@@ -676,31 +685,6 @@
       </xs:annotation>
     </xs:attribute>
 
-    <xs:attribute name="slaveConfig" use="optional" default="">
-      <xs:annotation>
-        <xs:appinfo>
-           <tooltip>Roxie Server Redundancy</tooltip>
-           <title>redundancy</title>
-        </xs:appinfo>
-      </xs:annotation>
-      <xs:simpleType>
-        <xs:restriction base="xs:string">
-          <xs:enumeration value=""/>
-          <xs:enumeration value="overloaded"/>
-          <xs:enumeration value="full redundancy"/>
-          <xs:enumeration value="cyclic redundancy"/>
-        </xs:restriction>
-      </xs:simpleType>
-    </xs:attribute>
-
-    <xs:attribute name="offSet" type="xs:nonNegativeInteger" use="optional" default="1">
-      <xs:annotation>
-        <xs:appinfo>
-          <tooltip>Roxie Channel offset</tooltip>
-        </xs:appinfo>
-      </xs:annotation>
-    </xs:attribute>
-
    <xs:attribute name="slaveThreads" type="xs:nonNegativeInteger" use="optional" default="30">
       <xs:annotation>
         <xs:appinfo>
@@ -765,6 +749,34 @@
       </xs:annotation>
     </xs:attribute>
   </xs:attributeGroup>
+  <xs:attributeGroup name="Redundancy">
+
+    <xs:attribute name="cyclicOffset" type="xs:nonNegativeInteger" use="optional" default="1">
+      <xs:annotation>
+        <xs:appinfo>
+          <tooltip>Offset for cyclic redundancy mode</tooltip>
+        </xs:appinfo>
+      </xs:annotation>
+    </xs:attribute>
+
+    <xs:attribute name="slaveConfig" use="optional" default="">
+      <xs:annotation>
+        <xs:appinfo>
+           <tooltip>Roxie data redundancy mode</tooltip>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:simpleType>
+        <xs:restriction base="xs:string">
+          <xs:enumeration value="simple"/>
+          <xs:enumeration value="overloaded"/>
+          <xs:enumeration value="full redundancy"/>
+          <xs:enumeration value="cyclic redundancy"/>
+        </xs:restriction>
+      </xs:simpleType>
+    </xs:attribute>
+
+
+  </xs:attributeGroup>
   <xs:attributeGroup name="Tracing">
     <xs:attribute name="traceLevel" type="xs:nonNegativeInteger" use="optional" default="1">
       <xs:annotation>

initfiles/etc/DIR_NAME/environment.xml.in

@@ -907,7 +907,7 @@
                       requestArrayThreads="5"/>
    <RoxieServerProcess 
                        computer="localhost"
-                       name="farm2_s1"
+                       name="s1"
                        netAddress="."/>
   </RoxieCluster>
   <SashaServerProcess autoRestartInterval="0"