Skip to content

Commit b221017

Browse files
committed
Merge branch 'master' into push-to-client-sdks-oss-repos
2 parents 63789f8 + cc46a70 commit b221017

File tree

5 files changed

+353
-4
lines changed

5 files changed

+353
-4
lines changed

DelveClientSDK/Connection.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,17 @@ public void RemoveDefaultCompute(string dbname)
495495
CloudClient.RemoveDefaultCompute(dbname);
496496
}
497497

498+
public ICollection<ComputeEventInfo> ListComputeEvents(string computeId)
499+
{
500+
SetConnectionOnClients();
501+
return CloudClient.ListComputeEvents(computeId);
502+
}
503+
504+
public GetAccountCreditsResponse GetAccountCreditUsage(Period period=Period.Current_month)
505+
{
506+
SetConnectionOnClients();
507+
return CloudClient.GetAccountCreditUsage(period);
508+
}
498509
}
499510

500511
/// <summary>

DelveClientSDK/DelveCloudClient.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,5 +172,15 @@ public Tuple<UserInfoProtocol, string> CreateUser(string username, bool dryRun =
172172
var res = this.UserPutAsync(request).Result;
173173
return new Tuple<UserInfoProtocol, string>(res.User, res.Private_key);
174174
}
175+
176+
public ICollection<ComputeEventInfo> ListComputeEvents(string computeId)
177+
{
178+
return this.ListComputeEventsAsync(computeId).Result.Events;
179+
}
180+
181+
public GetAccountCreditsResponse GetAccountCreditUsage(Period period=Period.Current_month)
182+
{
183+
return this.AccountCreditsGetAsync(period).Result;
184+
}
175185
}
176186
}

DelveClientSDK/GeneratedDelveClient.cs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
349349
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
350350
public partial class CollectProblemsAction : Action
351351
{
352+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
353+
public string Dummy { get; set; }
354+
352355
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
353356

354357
[Newtonsoft.Json.JsonExtensionData]
@@ -507,6 +510,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
507510
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
508511
public partial class ListSourceAction : Action
509512
{
513+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
514+
public string Dummy { get; set; }
515+
510516
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
511517

512518
[Newtonsoft.Json.JsonExtensionData]
@@ -558,6 +564,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
558564
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
559565
public partial class JSONFileSchema : FileSchema
560566
{
567+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
568+
public string Dummy { get; set; }
569+
561570
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
562571

563572
[Newtonsoft.Json.JsonExtensionData]
@@ -636,6 +645,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
636645
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
637646
public partial class JSONFileSyntax : FileSyntax
638647
{
648+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
649+
public string Dummy { get; set; }
650+
639651
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
640652

641653
[Newtonsoft.Json.JsonExtensionData]
@@ -728,6 +740,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
728740
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
729741
public partial class DefaultIntegration : Integration
730742
{
743+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
744+
public string Dummy { get; set; }
745+
731746
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
732747

733748
[Newtonsoft.Json.JsonExtensionData]
@@ -743,6 +758,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
743758
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
744759
public partial class S3Integration : Integration
745760
{
761+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
762+
public string Dummy { get; set; }
763+
746764
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
747765

748766
[Newtonsoft.Json.JsonExtensionData]
@@ -926,6 +944,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
926944
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
927945
public partial class StatusAction : Action
928946
{
947+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
948+
public string Dummy { get; set; }
949+
929950
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
930951

931952
[Newtonsoft.Json.JsonExtensionData]
@@ -1483,6 +1504,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
14831504
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
14841505
public partial class Nil : LinkedList
14851506
{
1507+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1508+
public string Dummy { get; set; }
1509+
14861510
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
14871511

14881512
[Newtonsoft.Json.JsonExtensionData]
@@ -1561,6 +1585,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
15611585
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
15621586
public partial class ImportActionResult : ActionResult
15631587
{
1588+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1589+
public string Dummy { get; set; }
1590+
15641591
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
15651592

15661593
[Newtonsoft.Json.JsonExtensionData]
@@ -1576,6 +1603,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
15761603
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
15771604
public partial class InstallActionResult : ActionResult
15781605
{
1606+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1607+
public string Dummy { get; set; }
1608+
15791609
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
15801610

15811611
[Newtonsoft.Json.JsonExtensionData]
@@ -1627,6 +1657,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
16271657
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
16281658
public partial class LoadDataActionResult : ActionResult
16291659
{
1660+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1661+
public string Dummy { get; set; }
1662+
16301663
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
16311664

16321665
[Newtonsoft.Json.JsonExtensionData]
@@ -1696,6 +1729,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
16961729
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
16971730
public partial class SetOptionsActionResult : ActionResult
16981731
{
1732+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1733+
public string Dummy { get; set; }
1734+
16991735
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
17001736

17011737
[Newtonsoft.Json.JsonExtensionData]
@@ -1711,6 +1747,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
17111747
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
17121748
public partial class StatusActionResult : ActionResult
17131749
{
1750+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1751+
public string Dummy { get; set; }
1752+
17141753
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
17151754

17161755
[Newtonsoft.Json.JsonExtensionData]
@@ -1726,6 +1765,9 @@ public System.Collections.Generic.IDictionary<string, object> AdditionalProperti
17261765
[System.CodeDom.Compiler.GeneratedCode("NJsonSchema", "10.1.24.0 (Newtonsoft.Json v12.0.0.0)")]
17271766
public partial class UpdateActionResult : ActionResult
17281767
{
1768+
[Newtonsoft.Json.JsonProperty("dummy", Required = Newtonsoft.Json.Required.Default, NullValueHandling = Newtonsoft.Json.NullValueHandling.Ignore)]
1769+
public string Dummy { get; set; }
1770+
17291771
private System.Collections.Generic.IDictionary<string, object> _additionalProperties = new System.Collections.Generic.Dictionary<string, object>();
17301772

17311773
[Newtonsoft.Json.JsonExtensionData]

0 commit comments

Comments
 (0)