release 3.0.25-beta source code for net

huaweicloud · Dec 15, 2020 · ec7bc27 · ec7bc27
1 parent dd44b76
commit ec7bc27
Show file tree

Hide file tree

Showing 382 changed files with 39,743 additions and 2,017 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## 3.0.25-beta 2020-12-15
+## HuaweiCloud SDK CCE
+ - ### Features
+    - Support Cloud Container Engine service.
+ - ### Bug Fix
+    - None
+ - ### Change
+    - None
+
+## HuaweiCloud SDK ELB
+ - ### Features
+    - None
+ - ### Bug Fix
+    - Fix the problem that sending request to interface `CreateListener` returns empty response.
+    - Fix the problem that sending request to interface `CreateListener` returns response with wrong type. 
+ - ### Change
+    - None
+
+## HuaweiCloud SDK NAT
+ - ### Features
+    - None
+ - ### Bug Fix
+    - Fix the problem that using interface `BatchCreateNatGatewayDnatRules` failed. 
+ - ### Change
+    - None
+
+
 ## 3.0.24-beta 2020-12-04
 ## HuaweiCloud SDK SMN
  - ### Features

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,3 +1,30 @@
+## 3.0.25-beta 2020-12-15
+## HuaweiCloud SDK CCE
+ - ### 新增特性
+    - 支持云容器引擎服务
+ - ### 解决问题
+    - 无
+ - ### 特性变更
+    - 无
+
+## HuaweiCloud SDK ELB
+ - ### 新增特性
+    - 无
+ - ### 解决问题
+    - 创建监听器接口返回为空问题修复
+    - 证书列表查询接口返回非列表问题修复
+ - ### 特性变更
+    - 无
+
+## HuaweiCloud SDK NAT
+ - ### 新增特性
+    - 无
+ - ### 解决问题
+    - 修复批量创建DNAT规则失败的问题
+ - ### 特性变更
+    - 无
+
+
 ## 3.0.24-beta 2020-12-04
 ## HuaweiCloud SDK SMN
  - ### 新增特性

diff --git a/Core/Http/SdkHttpClient.cs b/Core/Http/SdkHttpClient.cs
@@ -103,12 +103,9 @@ public HttpRequestMessage InitHttpRequest(HttpRequest request)
                 }
             }
 
-            if (request.Body != null)
-            {
-                message.Content = new StringContent(request.Body);
-                message.Content.Headers.ContentType =
-                    new MediaTypeHeaderValue(select_header_content_type(request.ContentType));
-            }
+            message.Content = new StringContent(request.Body);
+            message.Content.Headers.ContentType =
+                new MediaTypeHeaderValue(select_header_content_type(request.ContentType));
 
             if (request.FileStream != null && request.FileStream != Stream.Null)
             {

diff --git a/Core/Utils/HttpUtils.cs b/Core/Utils/HttpUtils.cs
@@ -1,6 +1,6 @@
 /*
  * Copyright 2020 Huawei Technologies Co.,Ltd.
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -71,20 +71,18 @@ private static string GetQueryParameters(Object obj)
                 {
                     continue;
                 }
-                
+
                 if (value is IList list)
                 {
-                    var qs = new StringBuilder();
-                    foreach (var item in list)
-                    {
-                        qs.Append(sdkPropertyAttribute.PropertyName).Append("=").Append(Convert.ToString(item)).Append("&");
-                    }
-
-                    sb.Append(qs);
+                    sb.Append(BuildQueryListParameter(sdkPropertyAttribute.PropertyName, list));
+                }
+                else if(value is IDictionary dictionary)
+                {
+                    sb.Append(BuildQueryDictionaryParameter(sdkPropertyAttribute.PropertyName, dictionary));
                 }
                 else
                 {
-                    sb.Append(sdkPropertyAttribute.PropertyName).Append("=").Append(Convert.ToString(value)).Append("&");
+                    sb.Append(BuildQueryStringParameter(sdkPropertyAttribute.PropertyName, Convert.ToString(value)));
                 }
             }
 
@@ -97,6 +95,45 @@ private static string GetQueryParameters(Object obj)
             return sb.ToString();
         }
 
+        private static StringBuilder BuildQueryStringParameter(string key, string value)
+        {
+            var sb = new StringBuilder();
+            return sb.Append(key).Append("=").Append(Convert.ToString(value)).Append("&");
+        }
+
+        private static StringBuilder BuildQueryListParameter(string key, IList list)
+        {
+            var sb = new StringBuilder();
+            foreach (var item in list)
+            {
+                sb.Append(key).Append("=").Append(Convert.ToString(item)).Append("&");
+            }
+
+            return sb;
+        }
+
+        private static StringBuilder BuildQueryDictionaryParameter(string key, IDictionary dict)
+        {
+            var sb = new StringBuilder();
+            foreach (var k in dict.Keys)
+            {
+                if (dict[k] is IList list)
+                {
+                    sb.Append(BuildQueryListParameter(key + "[" + k + "]", list));
+                }
+                else if (dict[k] is IDictionary dictionary)
+                {
+                    sb.Append(BuildQueryDictionaryParameter(key + "[" + k + "]", dictionary));
+                }
+                else
+                {
+                    sb.Append(BuildQueryStringParameter(key + "[" + k + "]", Convert.ToString(dict[k])));
+                }
+            }
+
+            return sb;
+        }
+
         private static Dictionary<string, string> GetRequestHeader(object obj)
         {
             var t = obj.GetType();

diff --git a/Core/obj/Core.csproj.nuget.cache b/Core/obj/Core.csproj.nuget.cache
@@ -1,5 +1,5 @@
 {
   "version": 1,
-  "dgSpecHash": "eOmBYFBY5114ONMfTyvAtMrOBKQuv9e15FEeruyuAAJjKGiUZy7A7hA3D1fHHv3gvSfY00Q5VSPWuwpph9q2hQ==",
+  "dgSpecHash": "90zS6fzc/PfhVNVmXagvEyk/WCkUghh5ut66lTUKM/UDdr+kmESM4wDh6T5CkyIvqwf6kVmKSIBn0g+dkWElOg==",
   "success": true
 }
diff --git a/Core/obj/Core.csproj.nuget.dgspec.json b/Core/obj/Core.csproj.nuget.dgspec.json
@@ -1,17 +1,17 @@
 {
   "format": 1,
   "restore": {
-    "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj": {}
+    "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj": {}
   },
   "projects": {
-    "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj": {
+    "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj",
+        "projectUniqueName": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj",
         "projectName": "HuaweiCloud.SDK.Core",
-        "projectPath": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj",
+        "projectPath": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj",
         "packagesPath": "/root/.nuget/packages/",
-        "outputPath": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/obj/",
+        "outputPath": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/obj/",
         "projectStyle": "PackageReference",
         "fallbackFolders": [
           "/usr/dotnet/sdk/NuGetFallbackFolder"
@@ -23,7 +23,7 @@
           "netstandard2.0"
         ],
         "sources": {
-          "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/package": {}
+          "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/package": {}
         },
         "frameworks": {
           "netstandard2.0": {

diff --git a/Core/obj/Core.csproj.nuget.g.props b/Core/obj/Core.csproj.nuget.g.props
@@ -3,7 +3,7 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/obj/project.assets.json</ProjectAssetsFile>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/obj/project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/;/usr/dotnet/sdk/NuGetFallbackFolder</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>

diff --git a/Core/obj/project.assets.json b/Core/obj/project.assets.json
@@ -3593,11 +3593,11 @@
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj",
+      "projectUniqueName": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj",
       "projectName": "HuaweiCloud.SDK.Core",
-      "projectPath": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/Core.csproj",
+      "projectPath": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/Core.csproj",
       "packagesPath": "/root/.nuget/packages/",
-      "outputPath": "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/Core/obj/",
+      "outputPath": "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/Core/obj/",
       "projectStyle": "PackageReference",
       "fallbackFolders": [
         "/usr/dotnet/sdk/NuGetFallbackFolder"
@@ -3609,7 +3609,7 @@
         "netstandard2.0"
       ],
       "sources": {
-        "/data/fuxi_ci_workspace/5fcde8367ebd0c3984b5d3e9/package": {}
+        "/data/fuxi_ci_workspace/5fd89abc5c740a0a8a7e7090/package": {}
       },
       "frameworks": {
         "netstandard2.0": {