From 07e5933798daa6f0cdd3dec0edc1a6c9328bcacc Mon Sep 17 00:00:00 2001
From: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
Date: Thu, 27 Jul 2023 10:45:54 -0400
Subject: [PATCH] feat(comms): convert wsTopology to use service generated from
 wsdl

Signed-off-by: Jeremy Clements <79224539+jeclrsg@users.noreply.github.com>
---
 packages/comms/src/ecl/targetCluster.ts       |   22 +-
 packages/comms/src/ecl/topology.ts            |   18 +-
 packages/comms/src/services/wsTopology.ts     |  532 +------
 .../wsdl/WsTopology/v1.31/WsTopology.ts       | 1370 ++++++++---------
 4 files changed, 712 insertions(+), 1230 deletions(-)

diff --git a/packages/comms/src/ecl/targetCluster.ts b/packages/comms/src/ecl/targetCluster.ts
index 3c764ffbd6..d212e628ed 100644
--- a/packages/comms/src/ecl/targetCluster.ts
+++ b/packages/comms/src/ecl/targetCluster.ts
@@ -1,7 +1,7 @@
 import { Cache, StateObject } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
 import { WsMachine, WsMachineEx, MachineService } from "../services/wsMachine";
-import { TopologyService, TpListTargetClusters, TpTargetClusterQuery } from "../services/wsTopology";
+import { TopologyService, WsTopology } from "../services/wsTopology";
 import { Machine } from "./machine";
 
 export class TargetClusterCache extends Cache<{ BaseUrl: string, Name: string }, TargetCluster> {
@@ -17,8 +17,8 @@ export interface TpTargetClusterEx {
     MachineInfoEx: WsMachine.MachineInfoEx[];
 }
 
-export type UTargetClusterState = TpTargetClusterQuery.TpTargetCluster & TpListTargetClusters.TpClusterNameType & TpTargetClusterEx;
-export type ITargetClusterState = TpTargetClusterQuery.TpTargetCluster | TpListTargetClusters.TpClusterNameType | TpTargetClusterEx;
+export type UTargetClusterState = WsTopology.TpTargetCluster & WsTopology.TpClusterNameType & TpTargetClusterEx;
+export type ITargetClusterState = WsTopology.TpTargetCluster | WsTopology.TpClusterNameType | TpTargetClusterEx;
 export class TargetCluster extends StateObject<UTargetClusterState, ITargetClusterState> implements UTargetClusterState {
     protected connection: TopologyService;
     protected machineConnection: MachineService;
@@ -28,11 +28,11 @@ export class TargetCluster extends StateObject<UTargetClusterState, ITargetClust
     get Prefix(): string { return this.get("Prefix"); }
     get Type(): string { return this.get("Type"); }
     get IsDefault(): boolean { return this.get("IsDefault"); }
-    get TpClusters(): TpTargetClusterQuery.TpClusters { return this.get("TpClusters"); }
-    get TpEclCCServers(): TpTargetClusterQuery.TpEclCCServers { return this.get("TpEclCCServers"); }
-    get TpEclServers(): TpTargetClusterQuery.TpEclServers { return this.get("TpEclServers"); }
-    get TpEclAgents(): TpTargetClusterQuery.TpEclAgents { return this.get("TpEclAgents"); }
-    get TpEclSchedulers(): TpTargetClusterQuery.TpEclSchedulers { return this.get("TpEclSchedulers"); }
+    get TpClusters(): WsTopology.TpClusters { return this.get("TpClusters"); }
+    get TpEclCCServers(): WsTopology.TpEclCCServers { return this.get("TpEclCCServers"); }
+    get TpEclServers(): WsTopology.TpEclServers { return this.get("TpEclServers"); }
+    get TpEclAgents(): WsTopology.TpEclAgents { return this.get("TpEclAgents"); }
+    get TpEclSchedulers(): WsTopology.TpEclSchedulers { return this.get("TpEclSchedulers"); }
     get MachineInfoEx(): WsMachine.MachineInfoEx[] { return this.get("MachineInfoEx", []); }
     get CMachineInfoEx(): Machine[] {
         return this.MachineInfoEx.map(machineInfoEx => Machine.attach(this.machineConnection, machineInfoEx.Address, machineInfoEx));
@@ -129,9 +129,9 @@ export function defaultTargetCluster(optsConnection: IOptions | IConnection | To
             connection = new TopologyService(optsConnection);
         }
         _defaultTargetCluster[optsConnection.baseUrl] = connection.TpListTargetClusters({}).then(response => {
-            let firstItem: TpListTargetClusters.TpClusterNameType;
-            let defaultItem: TpListTargetClusters.TpClusterNameType;
-            let hthorItem: TpListTargetClusters.TpClusterNameType;
+            let firstItem: WsTopology.TpClusterNameType;
+            let defaultItem: WsTopology.TpClusterNameType;
+            let hthorItem: WsTopology.TpClusterNameType;
             response.TargetClusters.TpClusterNameType.forEach(item => {
                 if (!firstItem) {
                     firstItem = item;
diff --git a/packages/comms/src/ecl/topology.ts b/packages/comms/src/ecl/topology.ts
index e6087a0266..32ffd27b43 100644
--- a/packages/comms/src/ecl/topology.ts
+++ b/packages/comms/src/ecl/topology.ts
@@ -1,6 +1,6 @@
 import { Cache, exists, StateCallback, StateEvents, StateObject, StatePropCallback } from "@hpcc-js/util";
 import { IConnection, IOptions } from "../connection";
-import { TopologyService, TpLogicalClusterQuery, TpServiceQuery, TpTargetClusterQuery } from "../services/wsTopology";
+import { TopologyService, WsTopology } from "../services/wsTopology";
 import { TargetCluster } from "./targetCluster";
 
 export class TopologyCache extends Cache<{ BaseUrl: string }, Topology> {
@@ -13,9 +13,9 @@ export class TopologyCache extends Cache<{ BaseUrl: string }, Topology> {
 const _topology = new TopologyCache();
 
 export interface TopologyStateEx {
-    TargetClusters?: TpTargetClusterQuery.TpTargetCluster[];
-    LogicalClusters?: TpLogicalClusterQuery.TpLogicalCluster[];
-    Services?: TpServiceQuery.ServiceList;
+    TargetClusters?: WsTopology.TpTargetCluster[];
+    LogicalClusters?: WsTopology.TpLogicalCluster[];
+    Services?: WsTopology.ServiceList;
 }
 export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> implements TopologyStateEx {
     protected connection: TopologyService;
@@ -23,12 +23,12 @@ export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> impl
 
     //  Accessors  ---
     get properties(): TopologyStateEx { return this.get(); }
-    get TargetClusters(): TpTargetClusterQuery.TpTargetCluster[] { return this.get("TargetClusters"); }
+    get TargetClusters(): WsTopology.TpTargetCluster[] { return this.get("TargetClusters"); }
     get CTargetClusters(): TargetCluster[] {
         return this.TargetClusters.map(tc => TargetCluster.attach(this.connection, tc.Name, tc));
     }
-    get LogicalClusters(): TpLogicalClusterQuery.TpLogicalCluster[] { return this.get("LogicalClusters"); }
-    get Services(): TpServiceQuery.ServiceList { return this.get("Services"); }
+    get LogicalClusters(): WsTopology.TpLogicalCluster[] { return this.get("LogicalClusters"); }
+    get Services(): WsTopology.ServiceList { return this.get("Services"); }
 
     static attach(optsConnection: IOptions | IConnection | TopologyService) {
         const retVal: Topology = _topology.get({ BaseUrl: optsConnection.baseUrl }, () => {
@@ -75,7 +75,7 @@ export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> impl
         });
     }
 
-    fetchLogicalClusters(request: TpLogicalClusterQuery.Request = {}): Promise<TpLogicalClusterQuery.TpLogicalCluster[]> {
+    fetchLogicalClusters(request: WsTopology.TpLogicalClusterQueryRequest = {}): Promise<WsTopology.TpLogicalCluster[]> {
         return this.connection.TpLogicalClusterQuery(request).then(response => {
             this.set({
                 LogicalClusters: response.TpLogicalClusters.TpLogicalCluster
@@ -84,7 +84,7 @@ export class Topology extends StateObject<TopologyStateEx, TopologyStateEx> impl
         });
     }
 
-    fetchServices(request: TpServiceQuery.Request = {}): Promise<TpServiceQuery.ServiceList> {
+    fetchServices(request: WsTopology.TpServiceQueryRequest = {}): Promise<WsTopology.ServiceList> {
         return this.connection.TpServiceQuery(request).then(response => {
             this.set({
                 Services: response.ServiceList
diff --git a/packages/comms/src/services/wsTopology.ts b/packages/comms/src/services/wsTopology.ts
index 0f685b3219..08ab62479b 100644
--- a/packages/comms/src/services/wsTopology.ts
+++ b/packages/comms/src/services/wsTopology.ts
@@ -1,513 +1,11 @@
-import { IConnection, IOptions } from "../connection";
-import { Service } from "../espConnection";
+import { IOptions } from "../connection";
+import { TopologyServiceBase, WsTopology } from "./wsdl/WsTopology/v1.31/WsTopology";
 
-/*
-    Response structures generated via:
-    * http://localhost:8010/WsTopology/TpLogicalClusterQuery?respjson_
-    * http://json2ts.com/
-*/
+export {
+    WsTopology
+};
 
-export namespace TpLogicalClusterQuery {
-    export enum RoxieQueueFilter {
-        All = "All",
-        QueriesOnly = "QueriesOnly",
-        WorkunitsOnly = "WorkunitsOnly"
-    }
-
-    export interface Request {
-        EclServerQueue?: string;
-        RoxieQueueFilter?: RoxieQueueFilter;
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface TpLogicalCluster {
-        Name: string;
-        Queue: string;
-        LanguageVersion: string;
-        Process: string;
-        Type: string;
-        QueriesOnly?: boolean;
-    }
-
-    export interface TpLogicalClusters {
-        TpLogicalCluster: TpLogicalCluster[];
-    }
-
-    export interface Response {
-        Exceptions: Exceptions;
-        TpLogicalClusters: TpLogicalClusters;
-    }
-}
-
-export namespace TpServiceQuery {
-    export interface Request {
-        Type?: string;
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface TpMachine {
-        Name: string;
-        Netaddress: string;
-        ConfigNetaddress: string;
-        Domain: string;
-        Directory: string;
-        Type: string;
-        Available: string;
-        OS: number;
-        Path: string;
-        Port: number;
-        ProcessNumber: number;
-        Channels: number;
-    }
-
-    export interface TpMachines {
-        TpMachine: TpMachine[];
-    }
-
-    export interface TpDali {
-        Name: string;
-        Description: string;
-        Build: string;
-        BackupComputer: string;
-        BackupDirectory: string;
-        Type: string;
-        Path: string;
-        LogDirectory: string;
-        AuditLogDirectory: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpDalis {
-        TpDali: TpDali[];
-    }
-
-    export interface TpDfuServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Queue: string;
-        Type: string;
-        Path: string;
-        LogDirectory: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpDfuServers {
-        TpDfuServer: TpDfuServer[];
-    }
-
-    export interface TpDkcSlave {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpDkcSlaves {
-        TpDkcSlave: TpDkcSlave[];
-    }
-
-    export interface TpDropZone {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        ECLWatchVisible: boolean;
-        UMask: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpDropZones {
-        TpDropZone: TpDropZone[];
-    }
-
-    export interface TpEclAgent {
-        Name: string;
-        Description: string;
-        Build: string;
-        Type: string;
-        Path: string;
-        DaliServer: string;
-        LogDir: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclAgents {
-        TpEclAgent: TpEclAgent[];
-    }
-
-    export interface TpEclServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        LogDirectory: string;
-        Type: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclServers {
-        TpEclServer: TpEclServer[];
-    }
-
-    export interface TpEclCCServers {
-        TpEclServer: TpEclServer[];
-    }
-
-    export interface TpEclScheduler {
-        Name: string;
-        Description: string;
-        Build: string;
-        LogDirectory: string;
-        Type: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclSchedulers {
-        TpEclScheduler: TpEclScheduler[];
-    }
-
-    export interface TpBinding {
-        Name: string;
-        Service: string;
-        ServiceType: string;
-        BindingType: string;
-        ServiceBuildSet: string;
-        Port: string;
-        Protocol: string;
-    }
-
-    export interface TpBindings {
-        TpBinding: TpBinding[];
-    }
-
-    export interface TpEspServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Type: string;
-        Path: string;
-        LogDirectory: string;
-        TpMachines: TpMachines;
-        TpBindings: TpBindings;
-    }
-
-    export interface TpEspServers {
-        TpEspServer: TpEspServer[];
-    }
-
-    export interface TpFTSlave {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpFTSlaves {
-        TpFTSlave: TpFTSlave[];
-    }
-
-    export interface TpGenesisServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpGenesisServers {
-        TpGenesisServer: TpGenesisServer[];
-    }
-
-    export interface TpLdapServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpLdapServers {
-        TpLdapServer: TpLdapServer[];
-    }
-
-    export interface TpMySqlServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpMySqlServers {
-        TpMySqlServer: TpMySqlServer[];
-    }
-
-    export interface TpSashaServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        Path: string;
-        LogDirectory: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpSashaServers {
-        TpSashaServer: TpSashaServer[];
-    }
-
-    export interface TpSparkThor {
-        Name: string;
-        Build: string;
-        ThorClusterName: string;
-        ThorPath: string;
-        SparkExecutorCores: number;
-        SparkExecutorMemory: number;
-        SparkMasterPort: number;
-        SparkMasterWebUIPort: number;
-        SparkWorkerCores: number;
-        SparkWorkerMemory: number;
-        SparkWorkerPort: number;
-        LogDirectory: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpSparkThors {
-        TpSparkThor: TpSparkThor[];
-    }
-
-    export interface ServiceList {
-        TpDalis: TpDalis;
-        TpDfuServers: TpDfuServers;
-        TpDkcSlaves: TpDkcSlaves;
-        TpDropZones: TpDropZones;
-        TpEclAgents: TpEclAgents;
-        TpEclServers: TpEclServers;
-        TpEclCCServers: TpEclCCServers;
-        TpEclSchedulers: TpEclSchedulers;
-        TpEspServers: TpEspServers;
-        TpFTSlaves: TpFTSlaves;
-        TpGenesisServers: TpGenesisServers;
-        TpLdapServers: TpLdapServers;
-        TpMySqlServers: TpMySqlServers;
-        TpSashaServers: TpSashaServers;
-        TpSparkThors: TpSparkThors;
-    }
-
-    export interface Response {
-        Exceptions: Exceptions;
-        MemThreshold: number;
-        DiskThreshold: number;
-        CpuThreshold: number;
-        EncapsulatedSystem: boolean;
-        EnableSNMP: boolean;
-        PreflightProcessFilter: string;
-        AcceptLanguage: string;
-        MemThresholdType: string;
-        DiskThresholdType: string;
-        ServiceList: ServiceList;
-    }
-}
-
-export namespace TpTargetClusterQuery {
-
-    export interface Request {
-        Type?: string;
-        Name?: string;
-        ShowDetails?: boolean;
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface TpMachine {
-        Name: string;
-        Netaddress: string;
-        ConfigNetaddress: string;
-        Domain: string;
-        Directory: string;
-        Type: string;
-        Available: string;
-        OS: number;
-        Path: string;
-        Port: number;
-        ProcessNumber: number;
-        Channels: number;
-    }
-
-    export interface TpMachines {
-        TpMachine: TpMachine[];
-    }
-
-    export interface TpCluster {
-        Type: string;
-        Name: string;
-        QueueName: string;
-        Build: string;
-        Directory: string;
-        LogDirectory: string;
-        Desc: string;
-        Path: string;
-        DataModel: string;
-        OS: number;
-        HasThorSpareProcess: boolean;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpClusters {
-        TpCluster: TpCluster[];
-    }
-
-    export interface TpEclServer {
-        Name: string;
-        Description: string;
-        Build: string;
-        LogDirectory: string;
-        Type: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclCCServers {
-        TpEclServer: TpEclServer[];
-    }
-
-    export interface TpEclServers {
-        TpEclServer: TpEclServer[];
-    }
-
-    export interface TpEclAgent {
-        Name: string;
-        Description: string;
-        Build: string;
-        Type: string;
-        Path: string;
-        DaliServer: string;
-        LogDir: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclAgents {
-        TpEclAgent: TpEclAgent[];
-    }
-
-    export interface TpEclScheduler {
-        Name: string;
-        Description: string;
-        Build: string;
-        LogDirectory: string;
-        Type: string;
-        Path: string;
-        TpMachines: TpMachines;
-    }
-
-    export interface TpEclSchedulers {
-        TpEclScheduler: TpEclScheduler[];
-    }
-
-    export interface TpTargetCluster {
-        Name: string;
-        Prefix: string;
-        Type: string;
-        TpClusters: TpClusters;
-        TpEclCCServers: TpEclCCServers;
-        TpEclServers: TpEclServers;
-        TpEclAgents: TpEclAgents;
-        TpEclSchedulers: TpEclSchedulers;
-    }
-
-    export interface TpTargetClusters {
-        TpTargetCluster: TpTargetCluster[];
-    }
-
-    export interface Response {
-        Exceptions: Exceptions;
-        ShowDetails: boolean;
-        MemThreshold: number;
-        DiskThreshold: number;
-        CpuThreshold: number;
-        MemThresholdType: string;
-        DiskThresholdType: string;
-        PreflightProcessFilter: string;
-        AcceptLanguage: string;
-        TpTargetClusters: TpTargetClusters;
-    }
-}
-
-export namespace TpListTargetClusters {
-
-    export interface Request {
-    }
-
-    export interface Exception {
-        Code: string;
-        Audience: string;
-        Source: string;
-        Message: string;
-    }
-
-    export interface Exceptions {
-        Source: string;
-        Exception: Exception[];
-    }
-
-    export interface TpClusterNameType {
-        Name: string;
-        Type: string;
-        IsDefault: boolean;
-    }
-
-    export interface TargetClusters {
-        TpClusterNameType: TpClusterNameType[];
-    }
-
-    export interface Response {
-        Exceptions: Exceptions;
-        TargetClusters: TargetClusters;
-    }
-
-}
-
-export class TopologyService extends Service {
-
-    constructor(optsConnection: IOptions | IConnection) {
-        super(optsConnection, "WsTopology", "1.31");
-    }
+export class TopologyService extends TopologyServiceBase {
 
     connectionOptions(): IOptions {
         return this._connection.opts();
@@ -524,11 +22,7 @@ export class TopologyService extends Service {
         return parts2[0];
     }
 
-    TpLogicalClusterQuery(request: TpLogicalClusterQuery.Request = {}): Promise<TpLogicalClusterQuery.Response> {
-        return this._connection.send("TpLogicalClusterQuery", request);
-    }
-
-    DefaultTpLogicalClusterQuery(request: TpLogicalClusterQuery.Request = {}): Promise<TpLogicalClusterQuery.TpLogicalCluster> {
+    DefaultTpLogicalClusterQuery(request: WsTopology.TpLogicalClusterQueryRequest = {}): Promise<WsTopology.TpLogicalCluster> {
         return this.TpLogicalClusterQuery(request).then((response) => {
             if ((response as any).default) {
                 return (response as any).default;
@@ -548,16 +42,4 @@ export class TopologyService extends Service {
             return firstHThor || first;
         });
     }
-
-    TpServiceQuery(request: TpServiceQuery.Request): Promise<TpServiceQuery.Response> {
-        return this._connection.send("TpServiceQuery", request);
-    }
-
-    TpTargetClusterQuery(request: TpTargetClusterQuery.Request): Promise<TpTargetClusterQuery.Response> {
-        return this._connection.send("TpTargetClusterQuery", request);
-    }
-
-    TpListTargetClusters(request: TpListTargetClusters.Request): Promise<TpListTargetClusters.Response> {
-        return this._connection.send("TpListTargetClusters", request);
-    }
 }
diff --git a/packages/comms/src/services/wsdl/WsTopology/v1.31/WsTopology.ts b/packages/comms/src/services/wsdl/WsTopology/v1.31/WsTopology.ts
index b8b5e5527b..79e496bb38 100644
--- a/packages/comms/src/services/wsdl/WsTopology/v1.31/WsTopology.ts
+++ b/packages/comms/src/services/wsdl/WsTopology/v1.31/WsTopology.ts
@@ -1,328 +1,311 @@
 import { IConnection, IOptions } from "../../../../connection";
 import { Service } from "../../../../espConnection";
 
-type int = number;
-type base64Binary = string;
-type unsignedInt = number;
-type long = number;
-
-export enum RoxieQueueFilter {
-                All = "All",
-QueriesOnly = "QueriesOnly",
-WorkunitsOnly = "WorkunitsOnly"
-            }
-
 export namespace WsTopology {
 
-export interface WsTopologyPingRequest {
+    export type int = number;
+    export type base64Binary = string;
+    export type unsignedInt = number;
+    export type long = number;
 
-}
+    export enum RoxieQueueFilter {
+        All = "All",
+        QueriesOnly = "QueriesOnly",
+        WorkunitsOnly = "WorkunitsOnly"
+    }
 
-export interface WsTopologyPingResponse {
+    export interface WsTopologyPingRequest {
 
-}
+    }
 
-export interface SystemLogRequest {
-    Name?: string;
-    Type?: string;
-    Zip?: int;
-}
+    export interface WsTopologyPingResponse {
 
-export interface Exception {
-    Code: string;
-    Audience: string;
-    Source: string;
-    Message: string;
-}
+    }
 
-export interface Exceptions {
-    Source: string;
-    Exception: Exception[];
-}
+    export interface SystemLogRequest {
+        Name?: string;
+        Type?: string;
+        Zip?: int;
+    }
+
+    export interface Exception {
+        Code: string;
+        Audience: string;
+        Source: string;
+        Message: string;
+    }
 
-export interface SystemLogResponse {
-    Exceptions: {
+    export interface Exceptions {
         Source: string;
         Exception: Exception[];
-    };
-    thefile: base64Binary;
-}
+    }
 
-export interface TpClusterInfoRequest {
-    Name?: string;
-}
+    export interface SystemLogResponse {
+        Exceptions: {
+            Source: string;
+            Exception: Exception[];
+        };
+        thefile: base64Binary;
+    }
 
-export interface TpQueue {
-    Name: string;
-    WorkUnit: string;
-}
+    export interface TpClusterInfoRequest {
+        Name?: string;
+    }
 
-export interface TpQueues {
-    TpQueue: TpQueue[];
-}
+    export interface TpQueue {
+        Name: string;
+        WorkUnit: string;
+    }
 
-export interface TpClusterInfoResponse {
-    Exceptions: Exceptions;
-    Name: string;
-    WorkUnit: string;
-    TpQueues: {
+    export interface TpQueues {
         TpQueue: TpQueue[];
-    };
-}
+    }
 
-export interface TpClusterQueryRequest {
-    Type?: string;
-}
+    export interface TpClusterInfoResponse {
+        Exceptions: Exceptions;
+        Name: string;
+        WorkUnit: string;
+        TpQueues: {
+            TpQueue: TpQueue[];
+        };
+    }
 
-export interface TpMachine {
-    Name: string;
-    Netaddress: string;
-    ConfigNetaddress: string;
-    Domain: string;
-    Directory: string;
-    Type: string;
-    Available: string;
-    OS: int;
-    Path: string;
-    Port: int;
-    ProcessNumber: int;
-    Channels: unsignedInt;
-}
+    export interface TpClusterQueryRequest {
+        Type?: string;
+    }
 
-export interface TpMachines {
-    TpMachine: TpMachine[];
-}
+    export interface TpMachine {
+        Name: string;
+        Netaddress: string;
+        ConfigNetaddress: string;
+        Domain: string;
+        Directory: string;
+        Type: string;
+        Available: string;
+        OS: int;
+        Path: string;
+        Port: int;
+        ProcessNumber: int;
+        Channels: unsignedInt;
+    }
 
-export interface TpCluster {
-    Type: string;
-    Name: string;
-    QueueName: string;
-    Build: string;
-    Directory: string;
-    LogDirectory: string;
-    Desc: string;
-    Path: string;
-    DataModel: string;
-    OS: int;
-    HasThorSpareProcess: boolean;
-    TpMachines: {
+    export interface TpMachines {
         TpMachine: TpMachine[];
-    };
-}
+    }
 
-export interface TpClusters {
-    TpCluster: TpCluster[];
-}
+    export interface TpCluster {
+        Type: string;
+        Name: string;
+        QueueName: string;
+        Build: string;
+        Directory: string;
+        LogDirectory: string;
+        Desc: string;
+        Path: string;
+        DataModel: string;
+        OS: int;
+        HasThorSpareProcess: boolean;
+        TpMachines: {
+            TpMachine: TpMachine[];
+        };
+    }
 
-export interface TpClusterQueryResponse {
-    Exceptions: Exceptions;
-    EnableSNMP: boolean;
-    AcceptLanguage: string;
-    TpClusters: {
+    export interface TpClusters {
         TpCluster: TpCluster[];
-    };
-}
-
-export interface TpDropZoneQueryRequest {
-    Name?: string;
-    ECLWatchVisibleOnly?: boolean;
-}
+    }
+
+    export interface TpClusterQueryResponse {
+        Exceptions: Exceptions;
+        EnableSNMP: boolean;
+        AcceptLanguage: string;
+        TpClusters: {
+            TpCluster: TpCluster[];
+        };
+    }
 
-export interface TpDropZone {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    ECLWatchVisible: boolean;
-    UMask: string;
-    TpMachines: TpMachines;
-}
+    export interface TpDropZoneQueryRequest {
+        Name?: string;
+        ECLWatchVisibleOnly?: boolean;
+    }
 
-export interface TpDropZones {
-    TpDropZone: TpDropZone[];
-}
+    export interface TpDropZone {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        ECLWatchVisible: boolean;
+        UMask: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpDropZoneQueryResponse {
-    Exceptions: Exceptions;
-    TpDropZones: {
+    export interface TpDropZones {
         TpDropZone: TpDropZone[];
-    };
-}
-
-export interface TpGetComponentFileRequest {
-    CompType?: string;
-    CompName?: string;
-    NetAddress?: string;
-    Directory?: string;
-    FileType?: string;
-    OsType?: int;
-    PlainText?: string;
-}
-
-export interface TpGetComponentFileResponse {
-    Exceptions: Exceptions;
-    FileContents: base64Binary;
-}
-
-export interface TpGetServicePluginsRequest {
+    }
 
-}
-
-export interface Plugin {
-    ShortName: string;
-    LongName: string;
-    FolderName: string;
-    WidgetName: string;
-}
-
-export interface Plugins {
-    Plugin: Plugin[];
-}
-
-export interface TpGetServicePluginsResponse {
-    Exceptions: Exceptions;
-    Plugins: {
+    export interface TpDropZoneQueryResponse {
+        Exceptions: Exceptions;
+        TpDropZones: {
+            TpDropZone: TpDropZone[];
+        };
+    }
+
+    export interface TpGetComponentFileRequest {
+        CompType?: string;
+        CompName?: string;
+        NetAddress?: string;
+        Directory?: string;
+        FileType?: string;
+        OsType?: int;
+        PlainText?: string;
+    }
+
+    export interface TpGetComponentFileResponse {
+        Exceptions: Exceptions;
+        FileContents: base64Binary;
+    }
+
+    export interface TpGetServicePluginsRequest {
+
+    }
+
+    export interface Plugin {
+        ShortName: string;
+        LongName: string;
+        FolderName: string;
+        WidgetName: string;
+    }
+
+    export interface Plugins {
         Plugin: Plugin[];
-    };
-}
+    }
 
-export interface TpGroupQueryRequest {
-    Kind?: string;
-}
+    export interface TpGetServicePluginsResponse {
+        Exceptions: Exceptions;
+        Plugins: {
+            Plugin: Plugin[];
+        };
+    }
 
-export interface TpGroup {
-    Name: string;
-    Kind: string;
-    ReplicateOutputs: boolean;
-}
+    export interface TpGroupQueryRequest {
+        Kind?: string;
+    }
 
-export interface TpGroups {
-    TpGroup: TpGroup[];
-}
+    export interface TpGroup {
+        Name: string;
+        Kind: string;
+        ReplicateOutputs: boolean;
+    }
 
-export interface TpGroupQueryResponse {
-    Exceptions: Exceptions;
-    TpGroups: {
+    export interface TpGroups {
         TpGroup: TpGroup[];
-    };
-}
+    }
 
-export interface TpListTargetClustersRequest {
+    export interface TpGroupQueryResponse {
+        Exceptions: Exceptions;
+        TpGroups: {
+            TpGroup: TpGroup[];
+        };
+    }
 
-}
+    export interface TpListTargetClustersRequest {
 
-export interface TpClusterNameType {
-    Name: string;
-    Type: string;
-    IsDefault: boolean;
-}
+    }
 
-export interface TargetClusters {
-    TpClusterNameType: TpClusterNameType[];
-}
+    export interface TpClusterNameType {
+        Name: string;
+        Type: string;
+        IsDefault: boolean;
+    }
 
-export interface TpListTargetClustersResponse {
-    Exceptions: Exceptions;
-    TargetClusters: {
+    export interface TargetClusters {
         TpClusterNameType: TpClusterNameType[];
-    };
-}
-
-export interface TpLogFileRequest {
-    Name?: string;
-    Type?: string;
-    LastHours?: int;
-    StartDate?: string;
-    EndDate?: string;
-    FirstRows?: int;
-    LastRows?: int;
-    FilterType?: int;
-    Reversely?: boolean;
-    Zip?: boolean;
-    PageNumber?: int;
-    LoadData?: boolean;
-    IncludeLogFieldNames?: boolean;
-}
+    }
 
-export interface LogFieldNames {
-    Item: string[];
-}
-
-export interface TpLogFileResponse {
-    Exceptions: Exceptions;
-    Name: string;
-    Type: string;
-    StartDate: string;
-    EndDate: string;
-    LastHours: int;
-    FirstRows: int;
-    LastRows: int;
-    Reversely: boolean;
-    Zip: boolean;
-    FilterType: int;
-    LogData: string;
-    HasDate: boolean;
-    FileSize: long;
-    PageFrom: long;
-    PageTo: long;
-    PageNumber: int;
-    PrevPage: int;
-    NextPage: int;
-    TotalPages: int;
-    AcceptLanguage: string;
-    LogFieldNames: {
+    export interface TpListTargetClustersResponse {
+        Exceptions: Exceptions;
+        TargetClusters: {
+            TpClusterNameType: TpClusterNameType[];
+        };
+    }
+
+    export interface TpLogFileRequest {
+        Name?: string;
+        Type?: string;
+        LastHours?: int;
+        StartDate?: string;
+        EndDate?: string;
+        FirstRows?: int;
+        LastRows?: int;
+        FilterType?: int;
+        Reversely?: boolean;
+        Zip?: boolean;
+        PageNumber?: int;
+        LoadData?: boolean;
+        IncludeLogFieldNames?: boolean;
+    }
+
+    export interface LogFieldNames {
         Item: string[];
-    };
-}
+    }
 
-export interface TpLogicalClusterQueryRequest {
-    EclServerQueue?: string;
-    RoxieQueueFilter?: RoxieQueueFilter;
-}
+    export interface TpLogFileResponse {
+        Exceptions: Exceptions;
+        Name: string;
+        Type: string;
+        StartDate: string;
+        EndDate: string;
+        LastHours: int;
+        FirstRows: int;
+        LastRows: int;
+        Reversely: boolean;
+        Zip: boolean;
+        FilterType: int;
+        LogData: string;
+        HasDate: boolean;
+        FileSize: long;
+        PageFrom: long;
+        PageTo: long;
+        PageNumber: int;
+        PrevPage: int;
+        NextPage: int;
+        TotalPages: int;
+        AcceptLanguage: string;
+        LogFieldNames: {
+            Item: string[];
+        };
+    }
 
-export interface TpLogicalCluster {
-    Name: string;
-    Queue: string;
-    LanguageVersion: string;
-    Process: string;
-    Type: string;
-    QueriesOnly: boolean;
-}
+    export interface TpLogicalClusterQueryRequest {
+        EclServerQueue?: string;
+        RoxieQueueFilter?: RoxieQueueFilter;
+    }
 
-export interface TpLogicalClusters {
-    TpLogicalCluster: TpLogicalCluster[];
-}
+    export interface TpLogicalCluster {
+        Name: string;
+        Queue: string;
+        LanguageVersion: string;
+        Process: string;
+        Type: string;
+        QueriesOnly: boolean;
+    }
 
-export interface TpLogicalClusterQueryResponse {
-    Exceptions: Exceptions;
-    TpLogicalClusters: {
+    export interface TpLogicalClusters {
         TpLogicalCluster: TpLogicalCluster[];
-    };
-}
+    }
 
-export interface TpMachineInfoRequest {
-    Name?: string;
-    NetAddress?: string;
-}
+    export interface TpLogicalClusterQueryResponse {
+        Exceptions: Exceptions;
+        TpLogicalClusters: {
+            TpLogicalCluster: TpLogicalCluster[];
+        };
+    }
 
-export interface MachineInfo {
-    Name: string;
-    Netaddress: string;
-    ConfigNetaddress: string;
-    Domain: string;
-    Directory: string;
-    Type: string;
-    Available: string;
-    OS: int;
-    Path: string;
-    Port: int;
-    ProcessNumber: int;
-    Channels: unsignedInt;
-}
+    export interface TpMachineInfoRequest {
+        Name?: string;
+        NetAddress?: string;
+    }
 
-export interface TpMachineInfoResponse {
-    Exceptions: Exceptions;
-    MachineInfo: {
+    export interface MachineInfo {
         Name: string;
         Netaddress: string;
         ConfigNetaddress: string;
@@ -335,304 +318,264 @@ export interface TpMachineInfoResponse {
         Port: int;
         ProcessNumber: int;
         Channels: unsignedInt;
-    };
-}
-
-export interface TpMachineQueryRequest {
-    Type?: string;
-    Cluster?: string;
-    OldIP?: string;
-    Path?: string;
-    Directory?: string;
-    LogDirectory?: string;
-}
-
-export interface TpMachineQueryResponse {
-    Exceptions: Exceptions;
-    EnablePreflightInfo: boolean;
-    HasThorSpareProcess: boolean;
-    Type: string;
-    Cluster: string;
-    OldIP: string;
-    LogDirectory: string;
-    Path: string;
-    MemThreshold: int;
-    DiskThreshold: int;
-    CpuThreshold: int;
-    MemThresholdType: string;
-    DiskThresholdType: string;
-    PreflightProcessFilter: string;
-    EnableSNMP: boolean;
-    AcceptLanguage: string;
-    TpMachines: TpMachines;
-}
-
-export interface TpServiceQueryRequest {
-    Type?: string;
-}
-
-export interface TpDali {
-    Name: string;
-    Description: string;
-    Build: string;
-    BackupComputer: string;
-    BackupDirectory: string;
-    Type: string;
-    Path: string;
-    LogDirectory: string;
-    AuditLogDirectory: string;
-    TpMachines: TpMachines;
-}
-
-export interface TpDalis {
-    TpDali: TpDali[];
-}
-
-export interface TpDfuServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Queue: string;
-    Type: string;
-    Path: string;
-    LogDirectory: string;
-    TpMachines: TpMachines;
-}
+    }
+
+    export interface TpMachineInfoResponse {
+        Exceptions: Exceptions;
+        MachineInfo: {
+            Name: string;
+            Netaddress: string;
+            ConfigNetaddress: string;
+            Domain: string;
+            Directory: string;
+            Type: string;
+            Available: string;
+            OS: int;
+            Path: string;
+            Port: int;
+            ProcessNumber: int;
+            Channels: unsignedInt;
+        };
+    }
+
+    export interface TpMachineQueryRequest {
+        Type?: string;
+        Cluster?: string;
+        OldIP?: string;
+        Path?: string;
+        Directory?: string;
+        LogDirectory?: string;
+    }
+
+    export interface TpMachineQueryResponse {
+        Exceptions: Exceptions;
+        EnablePreflightInfo: boolean;
+        HasThorSpareProcess: boolean;
+        Type: string;
+        Cluster: string;
+        OldIP: string;
+        LogDirectory: string;
+        Path: string;
+        MemThreshold: int;
+        DiskThreshold: int;
+        CpuThreshold: int;
+        MemThresholdType: string;
+        DiskThresholdType: string;
+        PreflightProcessFilter: string;
+        EnableSNMP: boolean;
+        AcceptLanguage: string;
+        TpMachines: TpMachines;
+    }
+
+    export interface TpServiceQueryRequest {
+        Type?: string;
+    }
+
+    export interface TpDali {
+        Name: string;
+        Description: string;
+        Build: string;
+        BackupComputer: string;
+        BackupDirectory: string;
+        Type: string;
+        Path: string;
+        LogDirectory: string;
+        AuditLogDirectory: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpDfuServers {
-    TpDfuServer: TpDfuServer[];
-}
+    export interface TpDalis {
+        TpDali: TpDali[];
+    }
 
-export interface TpDkcSlave {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpDfuServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Queue: string;
+        Type: string;
+        Path: string;
+        LogDirectory: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpDkcSlaves {
-    TpDkcSlave: TpDkcSlave[];
-}
+    export interface TpDfuServers {
+        TpDfuServer: TpDfuServer[];
+    }
 
-export interface TpEclAgent {
-    Name: string;
-    Description: string;
-    Build: string;
-    Type: string;
-    Path: string;
-    DaliServer: string;
-    LogDir: string;
-    TpMachines: TpMachines;
-}
+    export interface TpDkcSlave {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpEclAgents {
-    TpEclAgent: TpEclAgent[];
-}
+    export interface TpDkcSlaves {
+        TpDkcSlave: TpDkcSlave[];
+    }
 
-export interface TpEclServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    LogDirectory: string;
-    Type: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpEclAgent {
+        Name: string;
+        Description: string;
+        Build: string;
+        Type: string;
+        Path: string;
+        DaliServer: string;
+        LogDir: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpEclServers {
-    TpEclServer: TpEclServer[];
-}
+    export interface TpEclAgents {
+        TpEclAgent: TpEclAgent[];
+    }
 
-export interface TpEclCCServers {
-    TpEclServer: TpEclServer[];
-}
+    export interface TpEclServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        LogDirectory: string;
+        Type: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpEclScheduler {
-    Name: string;
-    Description: string;
-    Build: string;
-    LogDirectory: string;
-    Type: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpEclServers {
+        TpEclServer: TpEclServer[];
+    }
 
-export interface TpEclSchedulers {
-    TpEclScheduler: TpEclScheduler[];
-}
+    export interface TpEclCCServers {
+        TpEclServer: TpEclServer[];
+    }
 
-export interface TpBinding {
-    Name: string;
-    Service: string;
-    ServiceType: string;
-    BindingType: string;
-    ServiceBuildSet: string;
-    Port: string;
-    Protocol: string;
-}
+    export interface TpEclScheduler {
+        Name: string;
+        Description: string;
+        Build: string;
+        LogDirectory: string;
+        Type: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpBindings {
-    TpBinding: TpBinding[];
-}
+    export interface TpEclSchedulers {
+        TpEclScheduler: TpEclScheduler[];
+    }
 
-export interface TpEspServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Type: string;
-    Path: string;
-    LogDirectory: string;
-    TpMachines: TpMachines;
-    TpBindings: {
+    export interface TpBinding {
+        Name: string;
+        Service: string;
+        ServiceType: string;
+        BindingType: string;
+        ServiceBuildSet: string;
+        Port: string;
+        Protocol: string;
+    }
+
+    export interface TpBindings {
         TpBinding: TpBinding[];
-    };
-}
+    }
 
-export interface TpEspServers {
-    TpEspServer: TpEspServer[];
-}
+    export interface TpEspServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Type: string;
+        Path: string;
+        LogDirectory: string;
+        TpMachines: TpMachines;
+        TpBindings: {
+            TpBinding: TpBinding[];
+        };
+    }
 
-export interface TpFTSlave {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpEspServers {
+        TpEspServer: TpEspServer[];
+    }
 
-export interface TpFTSlaves {
-    TpFTSlave: TpFTSlave[];
-}
+    export interface TpFTSlave {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpGenesisServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpFTSlaves {
+        TpFTSlave: TpFTSlave[];
+    }
 
-export interface TpGenesisServers {
-    TpGenesisServer: TpGenesisServer[];
-}
+    export interface TpGenesisServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpLdapServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpGenesisServers {
+        TpGenesisServer: TpGenesisServer[];
+    }
 
-export interface TpLdapServers {
-    TpLdapServer: TpLdapServer[];
-}
+    export interface TpLdapServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpMySqlServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpLdapServers {
+        TpLdapServer: TpLdapServer[];
+    }
 
-export interface TpMySqlServers {
-    TpMySqlServer: TpMySqlServer[];
-}
+    export interface TpMySqlServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpSashaServer {
-    Name: string;
-    Description: string;
-    Build: string;
-    Path: string;
-    LogDirectory: string;
-    TpMachines: TpMachines;
-}
+    export interface TpMySqlServers {
+        TpMySqlServer: TpMySqlServer[];
+    }
 
-export interface TpSashaServers {
-    TpSashaServer: TpSashaServer[];
-}
+    export interface TpSashaServer {
+        Name: string;
+        Description: string;
+        Build: string;
+        Path: string;
+        LogDirectory: string;
+        TpMachines: TpMachines;
+    }
 
-export interface TpSparkThor {
-    Name: string;
-    Build: string;
-    ThorClusterName: string;
-    ThorPath: string;
-    SparkExecutorCores: unsignedInt;
-    SparkExecutorMemory: long;
-    SparkMasterPort: unsignedInt;
-    SparkMasterWebUIPort: unsignedInt;
-    SparkWorkerCores: unsignedInt;
-    SparkWorkerMemory: long;
-    SparkWorkerPort: unsignedInt;
-    LogDirectory: string;
-    Path: string;
-    TpMachines: TpMachines;
-}
+    export interface TpSashaServers {
+        TpSashaServer: TpSashaServer[];
+    }
 
-export interface TpSparkThors {
-    TpSparkThor: TpSparkThor[];
-}
+    export interface TpSparkThor {
+        Name: string;
+        Build: string;
+        ThorClusterName: string;
+        ThorPath: string;
+        SparkExecutorCores: unsignedInt;
+        SparkExecutorMemory: long;
+        SparkMasterPort: unsignedInt;
+        SparkMasterWebUIPort: unsignedInt;
+        SparkWorkerCores: unsignedInt;
+        SparkWorkerMemory: long;
+        SparkWorkerPort: unsignedInt;
+        LogDirectory: string;
+        Path: string;
+        TpMachines: TpMachines;
+    }
 
-export interface ServiceList {
-    TpDalis: {
-        TpDali: TpDali[];
-    };
-    TpDfuServers: {
-        TpDfuServer: TpDfuServer[];
-    };
-    TpDkcSlaves: {
-        TpDkcSlave: TpDkcSlave[];
-    };
-    TpDropZones: TpDropZones;
-    TpEclAgents: {
-        TpEclAgent: TpEclAgent[];
-    };
-    TpEclServers: {
-        TpEclServer: TpEclServer[];
-    };
-    TpEclCCServers: {
-        TpEclServer: TpEclServer[];
-    };
-    TpEclSchedulers: {
-        TpEclScheduler: TpEclScheduler[];
-    };
-    TpEspServers: {
-        TpEspServer: TpEspServer[];
-    };
-    TpFTSlaves: {
-        TpFTSlave: TpFTSlave[];
-    };
-    TpGenesisServers: {
-        TpGenesisServer: TpGenesisServer[];
-    };
-    TpLdapServers: {
-        TpLdapServer: TpLdapServer[];
-    };
-    TpMySqlServers: {
-        TpMySqlServer: TpMySqlServer[];
-    };
-    TpSashaServers: {
-        TpSashaServer: TpSashaServer[];
-    };
-    TpSparkThors: {
+    export interface TpSparkThors {
         TpSparkThor: TpSparkThor[];
-    };
-}
+    }
 
-export interface TpServiceQueryResponse {
-    Exceptions: Exceptions;
-    MemThreshold: int;
-    DiskThreshold: int;
-    CpuThreshold: int;
-    EncapsulatedSystem: boolean;
-    EnableSNMP: boolean;
-    PreflightProcessFilter: string;
-    AcceptLanguage: string;
-    MemThresholdType: string;
-    DiskThresholdType: string;
-    ServiceList: {
+    export interface ServiceList {
         TpDalis: {
             TpDali: TpDali[];
         };
@@ -676,181 +619,238 @@ export interface TpServiceQueryResponse {
         TpSparkThors: {
             TpSparkThor: TpSparkThor[];
         };
-    };
-}
-
-export interface TpSetMachineStatusRequest {
-    MachinePath?: string;
-    StatusValue?: string;
-}
-
-export interface TpSetMachineStatusResponse {
-    Exceptions: Exceptions;
-    TpSetMachineStatusResult: boolean;
-}
-
-export interface TpSwapNodeRequest {
-    Cluster?: string;
-    OldIP?: string;
-    NewIP?: string;
-}
-
-export interface TpSwapNodeResponse {
-    Exceptions: Exceptions;
-    TpSwapNodeResult: boolean;
-}
-
-export interface TpTargetClusterQueryRequest {
-    Type?: string;
-    Name?: string;
-    ShowDetails?: boolean;
-}
-
-export interface TpTargetCluster {
-    Name: string;
-    Prefix: string;
-    Type: string;
-    TpClusters: TpClusters;
-    TpEclCCServers: TpEclCCServers;
-    TpEclServers: TpEclServers;
-    TpEclAgents: TpEclAgents;
-    TpEclSchedulers: TpEclSchedulers;
-}
-
-export interface TpTargetClusters {
-    TpTargetCluster: TpTargetCluster[];
-}
-
-export interface TpTargetClusterQueryResponse {
-    Exceptions: Exceptions;
-    ShowDetails: boolean;
-    MemThreshold: int;
-    DiskThreshold: int;
-    CpuThreshold: int;
-    MemThresholdType: string;
-    DiskThresholdType: string;
-    PreflightProcessFilter: string;
-    AcceptLanguage: string;
-    TpTargetClusters: {
+    }
+
+    export interface TpServiceQueryResponse {
+        Exceptions: Exceptions;
+        MemThreshold: int;
+        DiskThreshold: int;
+        CpuThreshold: int;
+        EncapsulatedSystem: boolean;
+        EnableSNMP: boolean;
+        PreflightProcessFilter: string;
+        AcceptLanguage: string;
+        MemThresholdType: string;
+        DiskThresholdType: string;
+        ServiceList: {
+            TpDalis: {
+                TpDali: TpDali[];
+            };
+            TpDfuServers: {
+                TpDfuServer: TpDfuServer[];
+            };
+            TpDkcSlaves: {
+                TpDkcSlave: TpDkcSlave[];
+            };
+            TpDropZones: TpDropZones;
+            TpEclAgents: {
+                TpEclAgent: TpEclAgent[];
+            };
+            TpEclServers: {
+                TpEclServer: TpEclServer[];
+            };
+            TpEclCCServers: {
+                TpEclServer: TpEclServer[];
+            };
+            TpEclSchedulers: {
+                TpEclScheduler: TpEclScheduler[];
+            };
+            TpEspServers: {
+                TpEspServer: TpEspServer[];
+            };
+            TpFTSlaves: {
+                TpFTSlave: TpFTSlave[];
+            };
+            TpGenesisServers: {
+                TpGenesisServer: TpGenesisServer[];
+            };
+            TpLdapServers: {
+                TpLdapServer: TpLdapServer[];
+            };
+            TpMySqlServers: {
+                TpMySqlServer: TpMySqlServer[];
+            };
+            TpSashaServers: {
+                TpSashaServer: TpSashaServer[];
+            };
+            TpSparkThors: {
+                TpSparkThor: TpSparkThor[];
+            };
+        };
+    }
+
+    export interface TpSetMachineStatusRequest {
+        MachinePath?: string;
+        StatusValue?: string;
+    }
+
+    export interface TpSetMachineStatusResponse {
+        Exceptions: Exceptions;
+        TpSetMachineStatusResult: boolean;
+    }
+
+    export interface TpSwapNodeRequest {
+        Cluster?: string;
+        OldIP?: string;
+        NewIP?: string;
+    }
+
+    export interface TpSwapNodeResponse {
+        Exceptions: Exceptions;
+        TpSwapNodeResult: boolean;
+    }
+
+    export interface TpTargetClusterQueryRequest {
+        Type?: string;
+        Name?: string;
+        ShowDetails?: boolean;
+    }
+
+    export interface TpTargetCluster {
+        Name: string;
+        Prefix: string;
+        Type: string;
+        TpClusters: TpClusters;
+        TpEclCCServers: TpEclCCServers;
+        TpEclServers: TpEclServers;
+        TpEclAgents: TpEclAgents;
+        TpEclSchedulers: TpEclSchedulers;
+    }
+
+    export interface TpTargetClusters {
         TpTargetCluster: TpTargetCluster[];
-    };
-}
+    }
+
+    export interface TpTargetClusterQueryResponse {
+        Exceptions: Exceptions;
+        ShowDetails: boolean;
+        MemThreshold: int;
+        DiskThreshold: int;
+        CpuThreshold: int;
+        MemThresholdType: string;
+        DiskThresholdType: string;
+        PreflightProcessFilter: string;
+        AcceptLanguage: string;
+        TpTargetClusters: {
+            TpTargetCluster: TpTargetCluster[];
+        };
+    }
 
-export interface TpThorStatusRequest {
-    Name?: string;
-}
+    export interface TpThorStatusRequest {
+        Name?: string;
+    }
 
-export interface TpThorStatusResponse {
-    Exceptions: Exceptions;
-    Name: string;
-    Queue: string;
-    Group: string;
-    ThorMasterIPAddress: string;
-    Port: int;
-    StartTime: string;
-    LogFile: string;
-    Wuid: string;
-    Graph: string;
-    SubGraph: int;
-    SubGraphDuration: int;
-    AutoRefresh: int;
-}
+    export interface TpThorStatusResponse {
+        Exceptions: Exceptions;
+        Name: string;
+        Queue: string;
+        Group: string;
+        ThorMasterIPAddress: string;
+        Port: int;
+        StartTime: string;
+        LogFile: string;
+        Wuid: string;
+        Graph: string;
+        SubGraph: int;
+        SubGraphDuration: int;
+        AutoRefresh: int;
+    }
 
-export interface TpXMLFileRequest {
-    Name?: string;
-}
+    export interface TpXMLFileRequest {
+        Name?: string;
+    }
 
-export interface TpXMLFileResponse {
-    Exceptions: Exceptions;
-    thefile: base64Binary;
-}
+    export interface TpXMLFileResponse {
+        Exceptions: Exceptions;
+        thefile: base64Binary;
+    }
 
 }
 
 export class TopologyServiceBase extends Service {
 
-constructor(optsConnection: IOptions | IConnection) {
-super(optsConnection, "WsTopology", "1.31");
-}
+    constructor(optsConnection: IOptions | IConnection) {
+        super(optsConnection, "WsTopology", "1.31");
+    }
 
-Ping(request: WsTopology.WsTopologyPingRequest): Promise<WsTopology.WsTopologyPingResponse> {
-	return this._connection.send("Ping", request);
-}
+    Ping(request: WsTopology.WsTopologyPingRequest): Promise<WsTopology.WsTopologyPingResponse> {
+        return this._connection.send("Ping", request, "json", false, undefined, "WsTopologyPingResponse");
+    }
 
-SystemLog(request: WsTopology.SystemLogRequest): Promise<WsTopology.SystemLogResponse> {
-	return this._connection.send("SystemLog", request);
-}
+    SystemLog(request: WsTopology.SystemLogRequest): Promise<WsTopology.SystemLogResponse> {
+        return this._connection.send("SystemLog", request, "json", false, undefined, "SystemLogResponse");
+    }
 
-TpClusterInfo(request: WsTopology.TpClusterInfoRequest): Promise<WsTopology.TpClusterInfoResponse> {
-	return this._connection.send("TpClusterInfo", request);
-}
+    TpClusterInfo(request: WsTopology.TpClusterInfoRequest): Promise<WsTopology.TpClusterInfoResponse> {
+        return this._connection.send("TpClusterInfo", request, "json", false, undefined, "TpClusterInfoResponse");
+    }
 
-TpClusterQuery(request: WsTopology.TpClusterQueryRequest): Promise<WsTopology.TpClusterQueryResponse> {
-	return this._connection.send("TpClusterQuery", request);
-}
+    TpClusterQuery(request: WsTopology.TpClusterQueryRequest): Promise<WsTopology.TpClusterQueryResponse> {
+        return this._connection.send("TpClusterQuery", request, "json", false, undefined, "TpClusterQueryResponse");
+    }
 
-TpDropZoneQuery(request: WsTopology.TpDropZoneQueryRequest): Promise<WsTopology.TpDropZoneQueryResponse> {
-	return this._connection.send("TpDropZoneQuery", request);
-}
+    TpDropZoneQuery(request: WsTopology.TpDropZoneQueryRequest): Promise<WsTopology.TpDropZoneQueryResponse> {
+        return this._connection.send("TpDropZoneQuery", request, "json", false, undefined, "TpDropZoneQueryResponse");
+    }
 
-TpGetComponentFile(request: WsTopology.TpGetComponentFileRequest): Promise<WsTopology.TpGetComponentFileResponse> {
-	return this._connection.send("TpGetComponentFile", request);
-}
+    TpGetComponentFile(request: WsTopology.TpGetComponentFileRequest): Promise<WsTopology.TpGetComponentFileResponse> {
+        return this._connection.send("TpGetComponentFile", request, "json", false, undefined, "TpGetComponentFileResponse");
+    }
 
-TpGetServicePlugins(request: WsTopology.TpGetServicePluginsRequest): Promise<WsTopology.TpGetServicePluginsResponse> {
-	return this._connection.send("TpGetServicePlugins", request);
-}
+    TpGetServicePlugins(request: WsTopology.TpGetServicePluginsRequest): Promise<WsTopology.TpGetServicePluginsResponse> {
+        return this._connection.send("TpGetServicePlugins", request, "json", false, undefined, "TpGetServicePluginsResponse");
+    }
 
-TpGroupQuery(request: WsTopology.TpGroupQueryRequest): Promise<WsTopology.TpGroupQueryResponse> {
-	return this._connection.send("TpGroupQuery", request);
-}
+    TpGroupQuery(request: WsTopology.TpGroupQueryRequest): Promise<WsTopology.TpGroupQueryResponse> {
+        return this._connection.send("TpGroupQuery", request, "json", false, undefined, "TpGroupQueryResponse");
+    }
 
-TpListTargetClusters(request: WsTopology.TpListTargetClustersRequest): Promise<WsTopology.TpListTargetClustersResponse> {
-	return this._connection.send("TpListTargetClusters", request);
-}
+    TpListTargetClusters(request: WsTopology.TpListTargetClustersRequest): Promise<WsTopology.TpListTargetClustersResponse> {
+        return this._connection.send("TpListTargetClusters", request, "json", false, undefined, "TpListTargetClustersResponse");
+    }
 
-TpLogFile(request: WsTopology.TpLogFileRequest): Promise<WsTopology.TpLogFileResponse> {
-	return this._connection.send("TpLogFile", request);
-}
+    TpLogFile(request: WsTopology.TpLogFileRequest): Promise<WsTopology.TpLogFileResponse> {
+        return this._connection.send("TpLogFile", request, "json", false, undefined, "TpLogFileResponse");
+    }
 
-TpLogFileDisplay(request: WsTopology.TpLogFileRequest): Promise<WsTopology.TpLogFileResponse> {
-	return this._connection.send("TpLogFileDisplay", request);
-}
+    TpLogFileDisplay(request: WsTopology.TpLogFileRequest): Promise<WsTopology.TpLogFileResponse> {
+        return this._connection.send("TpLogFileDisplay", request, "json", false, undefined, "TpLogFileResponse");
+    }
 
-TpLogicalClusterQuery(request: WsTopology.TpLogicalClusterQueryRequest): Promise<WsTopology.TpLogicalClusterQueryResponse> {
-	return this._connection.send("TpLogicalClusterQuery", request);
-}
+    TpLogicalClusterQuery(request: WsTopology.TpLogicalClusterQueryRequest): Promise<WsTopology.TpLogicalClusterQueryResponse> {
+        return this._connection.send("TpLogicalClusterQuery", request, "json", false, undefined, "TpLogicalClusterQueryResponse");
+    }
 
-TpMachineInfo(request: WsTopology.TpMachineInfoRequest): Promise<WsTopology.TpMachineInfoResponse> {
-	return this._connection.send("TpMachineInfo", request);
-}
+    TpMachineInfo(request: WsTopology.TpMachineInfoRequest): Promise<WsTopology.TpMachineInfoResponse> {
+        return this._connection.send("TpMachineInfo", request, "json", false, undefined, "TpMachineInfoResponse");
+    }
 
-TpMachineQuery(request: WsTopology.TpMachineQueryRequest): Promise<WsTopology.TpMachineQueryResponse> {
-	return this._connection.send("TpMachineQuery", request);
-}
+    TpMachineQuery(request: WsTopology.TpMachineQueryRequest): Promise<WsTopology.TpMachineQueryResponse> {
+        return this._connection.send("TpMachineQuery", request, "json", false, undefined, "TpMachineQueryResponse");
+    }
 
-TpServiceQuery(request: WsTopology.TpServiceQueryRequest): Promise<WsTopology.TpServiceQueryResponse> {
-	return this._connection.send("TpServiceQuery", request);
-}
+    TpServiceQuery(request: WsTopology.TpServiceQueryRequest): Promise<WsTopology.TpServiceQueryResponse> {
+        return this._connection.send("TpServiceQuery", request, "json", false, undefined, "TpServiceQueryResponse");
+    }
 
-TpSetMachineStatus(request: WsTopology.TpSetMachineStatusRequest): Promise<WsTopology.TpSetMachineStatusResponse> {
-	return this._connection.send("TpSetMachineStatus", request);
-}
+    TpSetMachineStatus(request: WsTopology.TpSetMachineStatusRequest): Promise<WsTopology.TpSetMachineStatusResponse> {
+        return this._connection.send("TpSetMachineStatus", request, "json", false, undefined, "TpSetMachineStatusResponse");
+    }
 
-TpSwapNode(request: WsTopology.TpSwapNodeRequest): Promise<WsTopology.TpSwapNodeResponse> {
-	return this._connection.send("TpSwapNode", request);
-}
+    TpSwapNode(request: WsTopology.TpSwapNodeRequest): Promise<WsTopology.TpSwapNodeResponse> {
+        return this._connection.send("TpSwapNode", request, "json", false, undefined, "TpSwapNodeResponse");
+    }
 
-TpTargetClusterQuery(request: WsTopology.TpTargetClusterQueryRequest): Promise<WsTopology.TpTargetClusterQueryResponse> {
-	return this._connection.send("TpTargetClusterQuery", request);
-}
+    TpTargetClusterQuery(request: WsTopology.TpTargetClusterQueryRequest): Promise<WsTopology.TpTargetClusterQueryResponse> {
+        return this._connection.send("TpTargetClusterQuery", request, "json", false, undefined, "TpTargetClusterQueryResponse");
+    }
 
-TpThorStatus(request: WsTopology.TpThorStatusRequest): Promise<WsTopology.TpThorStatusResponse> {
-	return this._connection.send("TpThorStatus", request);
-}
+    TpThorStatus(request: WsTopology.TpThorStatusRequest): Promise<WsTopology.TpThorStatusResponse> {
+        return this._connection.send("TpThorStatus", request, "json", false, undefined, "TpThorStatusResponse");
+    }
 
-TpXMLFile(request: WsTopology.TpXMLFileRequest): Promise<WsTopology.TpXMLFileResponse> {
-	return this._connection.send("TpXMLFile", request);
-}
+    TpXMLFile(request: WsTopology.TpXMLFileRequest): Promise<WsTopology.TpXMLFileResponse> {
+        return this._connection.send("TpXMLFile", request, "json", false, undefined, "TpXMLFileResponse");
+    }
 
 }