update disk baseanti antipro ipanti pod redis live vod vm and add log…

…s yundingdatapush

sdk/src/Service/Antipro/Apis/DescribeCcsIpResourcesRequest.cs

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IP Resources APIs
+ * Anti DDoS Protection Package IP Resources APIs
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using JDCloudSDK.Core.Service;
+
+using JDCloudSDK.Core.Annotation;
+
+namespace  JDCloudSDK.Antipro.Apis
+{
+
+    /// <summary>
+    ///  查询 DDoS 防护包可防护的托管区公网 IP
+    /// </summary>
+    public class DescribeCcsIpResourcesRequest : JdcloudRequest
+    {
+        ///<summary>
+        /// 页码
+        ///</summary>
+        public   int? PageNumber{ get; set; }
+        ///<summary>
+        /// 分页大小
+        ///</summary>
+        public   int? PageSize{ get; set; }
+        ///<summary>
+        /// 地域编码, 防护包目前支持: 华北-北京, 华东-宿迁, 华东-上海
+        ///Required:true
+        ///</summary>
+        [Required]
+        public override  string RegionId{ get; set; }
+    }
+}

sdk/src/Service/Antipro/Apis/DescribeCcsIpResourcesResponse.cs

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IP Resources APIs
+ * Anti DDoS Protection Package IP Resources APIs
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using JDCloudSDK.Core.Service;
+
+
+namespace  JDCloudSDK.Antipro.Apis
+{
+
+    /// <summary>
+    ///  查询 DDoS 防护包可防护的托管区公网 IP
+    /// </summary>
+    public class DescribeCcsIpResourcesResponse : JdcloudResponse<DescribeCcsIpResourcesResult>
+    {
+    }
+}

sdk/src/Service/Antipro/Apis/DescribeCcsIpResourcesResult.cs

@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IP Resources APIs
+ * Anti DDoS Protection Package IP Resources APIs
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using JDCloudSDK.Core.Service;
+
+using JDCloudSDK.Antipro.Model;
+
+namespace  JDCloudSDK.Antipro.Apis
+{
+
+    /// <summary>
+    ///  查询 DDoS 防护包可防护的托管区公网 IP
+    /// </summary>
+    public class DescribeCcsIpResourcesResult : JdcloudResult
+    {
+        ///<summary>
+        /// DataList
+        ///</summary>
+        public List<IpResource> DataList{ get; set; }
+
+        ///<summary>
+        /// 当前页数量
+        ///</summary>
+        public   int? CurrentCount{ get; set; }
+        ///<summary>
+        /// 总数
+        ///</summary>
+        public   int? TotalCount{ get; set; }
+        ///<summary>
+        /// 总页数
+        ///</summary>
+        public   int? TotalPage{ get; set; }
+    }
+}

sdk/src/Service/Antipro/Apis/DescribeProtectedIpListRequest.cs

@@ -51,7 +51,7 @@ public class DescribeProtectedIpListRequest : JdcloudRequest
         ///</summary>
         public   int? InstanceId{ get; set; }
         ///<summary>
-        /// 被防护 IP类型: 0: 全部, 1: 弹性公网 IP, 2: 云物理服务器公网 IP
+        /// 被防护 IP类型: 0: 全部, 1: 弹性公网 IP, 2: 云物理服务器公网 IP, 4: 托管区公网 IP
         ///Required:true
         ///</summary>
         [Required]

sdk/src/Service/Antipro/ChangeLog.md

@@ -1,6 +1,7 @@
 # 更新历史 #
-API版本：1.0.0
+API版本：1.1.0
 
 |发布时间|版本号|更新|说明|
 |---|---|---|---|
+|2019-07-26|1.1.0|接口新增与更新|1. 增加 DDoS 防护包可防护的托管区公网 IP 查询接口<br>2. 查询已防护公网 IP 接口支持托管区<br>3. 防护规则支持 IP 黑白名单|
 |2018-05-25|1.0.0|初始版本|京东云 DDoS 防护包基本操作接口|

sdk/src/Service/Antipro/Client/AntiproClient.cs

@@ -155,6 +155,25 @@ public async Task<CreateInstanceResponse> CreateInstance(CreateInstanceRequest r
             return await new CreateInstanceExecutor().Client(this).Execute<CreateInstanceResponse, CreateInstanceResult, CreateInstanceRequest>(request).ConfigureAwait(false);
         }
 #endif
+#if NET40||NET35
+        /// <summary>
+        ///  查询 DDoS 防护包可防护的托管区公网 IP
+        /// </summary>
+        /// <param name="request">请求参数信息</param>
+        /// <returns>请求结果信息</returns>
+        public DescribeCcsIpResourcesResponse DescribeCcsIpResources(DescribeCcsIpResourcesRequest request) {
+            return  new DescribeCcsIpResourcesExecutor().Client(this).Execute<DescribeCcsIpResourcesResponse, DescribeCcsIpResourcesResult, DescribeCcsIpResourcesRequest>(request);
+        }
+#else
+        /// <summary>
+        ///  查询 DDoS 防护包可防护的托管区公网 IP
+        /// </summary>
+        /// <param name="request">请求参数信息</param>
+        /// <returns>请求结果信息</returns>
+        public async Task<DescribeCcsIpResourcesResponse> DescribeCcsIpResources(DescribeCcsIpResourcesRequest request) {
+            return await new DescribeCcsIpResourcesExecutor().Client(this).Execute<DescribeCcsIpResourcesResponse, DescribeCcsIpResourcesResult, DescribeCcsIpResourcesRequest>(request).ConfigureAwait(false);
+        }
+#endif
 #if NET40||NET35
         /// <summary>
         ///  删除防护包防护 IP

sdk/src/Service/Live/Client/DescribeLiveStreamListExecutor.cs → sdk/src/Service/Antipro/Client/DescribeCcsIpResourcesExecutor.cs

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Live-Video
- * 直播管理API
+ * IP Resources APIs
+ * Anti DDoS Protection Package IP Resources APIs
  *
  * OpenAPI spec version: v1
  * Contact: 
@@ -29,16 +29,16 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace JDCloudSDK.Live.Client
+namespace JDCloudSDK.Antipro.Client
 {
 
     /// <summary>
-    ///  查询直播流信息
+    ///  查询 DDoS 防护包可防护的托管区公网 IP
     /// </summary>
-    public class DescribeLiveStreamListExecutor : JdcloudExecutor
+    public class DescribeCcsIpResourcesExecutor : JdcloudExecutor
     {
         /// <summary>
-        ///  查询直播流信息接口的Http 请求方法
+        ///  查询 DDoS 防护包可防护的托管区公网 IP接口的Http 请求方法
         /// </summary>
         public override  string Method
         {
@@ -47,12 +47,12 @@ public override  string Method
             }
         }
         /// <summary>
-        ///  查询直播流信息接口的Http资源请求路径
+        ///  查询 DDoS 防护包可防护的托管区公网 IP接口的Http资源请求路径
         /// </summary>
         public override string Url
         {
             get {
-            return "/streams";
+            return "/regions/{regionId}/ccsIpResources";
             }
         }
     }

sdk/src/Service/Antipro/JDCloudSDK.Antipro.csproj

@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0;net35;net40;net45;net46;net47</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>1.0.0.1</Version>
+        <Version>1.1.0.1</Version>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <Description>京东云DDoS防护包相关接口</Description>
         <Copyright>Copyright  ©  2012-2018  JDCloud.com</Copyright>

sdk/src/Service/Antipro/Model/Country.cs

@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using JDCloudSDK.Antipro.Model;
 
 namespace JDCloudSDK.Antipro.Model
 {

sdk/src/Service/Antipro/Model/Instance.cs

@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using JDCloudSDK.Antipro.Model;
 
 namespace JDCloudSDK.Antipro.Model
 {

sdk/src/Service/Antipro/Model/IpResource.cs

@@ -75,7 +75,7 @@ public class IpResource
         ///</summary>
         public long? BalckHoleThreshold{ get; set; }
         ///<summary>
-        /// 绑定防护包 ID, 为 0 时表示未绑定防护包
+        /// 绑定防护包 ID, 为空字符时表示未绑定防护包
         ///</summary>
         public string InstanceId{ get; set; }
         ///<summary>

sdk/src/Service/Antipro/Model/ProtectedObject.cs

@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using JDCloudSDK.Antipro.Model;
 
 namespace JDCloudSDK.Antipro.Model
 {

sdk/src/Service/Antipro/Model/ProtectionRule.cs

@@ -27,7 +27,6 @@
 using System.Collections.Generic;
 using System.Text;
 
-using JDCloudSDK.Antipro.Model;
 
 namespace JDCloudSDK.Antipro.Model
 {
@@ -82,5 +81,13 @@ public class ProtectionRule
         /// geo 拦截地域列表
         ///</summary>
         public List<GeoBlack> GeoBlackList{ get; set; }
+        ///<summary>
+        /// IP 黑名单列表
+        ///</summary>
+        public List<string> IpBlackList{ get; set; }
+        ///<summary>
+        /// IP 白名单列表
+        ///</summary>
+        public List<string> IpWhiteList{ get; set; }
     }
 }

sdk/src/Service/Antipro/Model/ProtectionRuleSpec.cs

@@ -83,7 +83,16 @@ public class ProtectionRuleSpec
         public long? DatagramRangeMax{ get; set; }
         ///<summary>
         /// geo 拦截地域编码列表. 查询 &lt;a href&#x3D;&quot;http://docs.jdcloud.com/anti-ddos-protection-package/api/describegeoareas&quot;&gt;describeGeoAreas&lt;/a&gt; 接口获取可设置的地域编码列表
+        /// 
         ///</summary>
         public List<string> GeoBlackList{ get; set; }
+        ///<summary>
+        /// IP 黑名单列表
+        ///</summary>
+        public List<string> IpBlackList{ get; set; }
+        ///<summary>
+        /// IP 白名单列表
+        ///</summary>
+        public List<string> IpWhiteList{ get; set; }
     }
 }

sdk/src/Service/Baseanti/Apis/DescribeCcsIpResourcesRequest.cs

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2018 JDCLOUD.COM
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http:#www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * IP Resource APIs
+ * Anti DDoS Basic IP Resource APIs
+ *
+ * OpenAPI spec version: v1
+ * Contact: 
+ *
+ * NOTE: This class is auto generated by the jdcloud code generator program.
+ */
+
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using JDCloudSDK.Core.Service;
+
+using JDCloudSDK.Core.Annotation;
+
+namespace  JDCloudSDK.Baseanti.Apis
+{
+
+    /// <summary>
+    ///  查询基础防护已防护的托管区 IP 的安全信息
+    /// </summary>
+    public class DescribeCcsIpResourcesRequest : JdcloudRequest
+    {
+        ///<summary>
+        /// 页码
+        ///</summary>
+        public   int? PageNumber{ get; set; }
+        ///<summary>
+        /// 分页大小
+        ///</summary>
+        public   int? PageSize{ get; set; }
+        ///<summary>
+        /// 地域编码. 基础防护已支持华北-北京, 华东-宿迁, 华东-上海, 华南-广州
+        /// 
+        ///Required:true
+        ///</summary>
+        [Required]
+        public override  string RegionId{ get; set; }
+    }
+}