Addressed review comments.

- Removed malformed struct from ws_topology.ecm - Changed field named Type to be string - Removed special case mapping of ecm type
hpcc-systems · Jul 25, 2023 · a397adf · a397adf
1 parent 55e976b
commit a397adf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/esp/scm/ws_topology.ecm b/esp/scm/ws_topology.ecm
@@ -330,7 +330,7 @@ ESPStruct TpTargetCluster
 {
     string Name;
     string Prefix;
-    TpQueryType Type;
+    string Type;
 
     ESParray<ESPstruct TpCluster>   TpClusters;
     ESParray<ESPstruct TpEclServer> TpEclCCServers;
@@ -339,14 +339,9 @@ ESPStruct TpTargetCluster
     [min_ver("1.16")] ESParray<ESPstruct TpEclScheduler>  TpEclSchedulers;
 };
 
-ESPStruct TpQueryType
-{
-    TPCLUSTER;
-    TPNODE;
-};
 ESPrequest TpTargetClusterQueryRequest
 {
-    TpQueryType Type;
+    string Type;
     string Name;
     bool ShowDetails(false);
 };
@@ -639,7 +634,7 @@ ESPresponse [nil_remove, exceptions_inline] TpDropZoneQueryResponse
     ESParray<ESPstruct TpDropZone>    TpDropZones;
 };
 
-ESPservice [auth_feature("DEFERRED"), noforms, version("1.31"), cache_group("ESPWsTP"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
+ESPservice [auth_feature("DEFERRED"), noforms, version("1.32"), cache_group("ESPWsTP"), exceptions_inline("./smc_xslt/exceptions.xslt")] WsTopology
 {
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/targetclusters.xslt")] TpTargetClusterQuery(TpTargetClusterQueryRequest, TpTargetClusterQueryResponse);
     ESPmethod [cache_seconds(180), cache_global(1), resp_xsl_default("/esp/xslt/topology.xslt")] TpClusterQuery(TpClusterQueryRequest, TpClusterQueryResponse);

diff --git a/esp/xslt/esp_service_xml2xsd.xslt b/esp/xslt/esp_service_xml2xsd.xslt
@@ -153,8 +153,6 @@
                     </xsl:when>
                     <xsl:when test="@type='int64'">xsd:<xsl:value-of select="'long'"/>
                     </xsl:when>
-                    <xsl:when test="@type='TpQueryType'">xsd:<xsl:value-of select="'string'"/>
-                    </xsl:when>
                     <xsl:when test="@type">xsd:<xsl:value-of select="@type"/>
                     </xsl:when>
                     <xsl:when test="@complex_type">tns:<xsl:value-of select="@complex_type"/>