diff --git a/VERSION b/VERSION index c6ec2f70f..8772a1669 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.36.1894 \ No newline at end of file +1.36.1895 \ No newline at end of file diff --git a/computenest/CMakeLists.txt b/computenest/CMakeLists.txt index 97d8a4b52..3a15a0b1a 100644 --- a/computenest/CMakeLists.txt +++ b/computenest/CMakeLists.txt @@ -21,6 +21,8 @@ set(computenest_public_header include/alibabacloud/computenest/ComputeNestExport.h ) set(computenest_public_header_model + include/alibabacloud/computenest/model/ChangeResourceGroupRequest.h + include/alibabacloud/computenest/model/ChangeResourceGroupResult.h include/alibabacloud/computenest/model/ContinueDeployServiceInstanceRequest.h include/alibabacloud/computenest/model/ContinueDeployServiceInstanceResult.h include/alibabacloud/computenest/model/CreateServiceInstanceRequest.h @@ -29,6 +31,8 @@ set(computenest_public_header_model include/alibabacloud/computenest/model/DeleteServiceInstancesResult.h include/alibabacloud/computenest/model/GetServiceInstanceRequest.h include/alibabacloud/computenest/model/GetServiceInstanceResult.h + include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsRequest.h + include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsResult.h include/alibabacloud/computenest/model/ListServiceInstanceLogsRequest.h include/alibabacloud/computenest/model/ListServiceInstanceLogsResult.h include/alibabacloud/computenest/model/ListServiceInstanceResourcesRequest.h @@ -38,6 +42,8 @@ set(computenest_public_header_model set(computenest_src src/ComputeNestClient.cc + src/model/ChangeResourceGroupRequest.cc + src/model/ChangeResourceGroupResult.cc src/model/ContinueDeployServiceInstanceRequest.cc src/model/ContinueDeployServiceInstanceResult.cc src/model/CreateServiceInstanceRequest.cc @@ -46,6 +52,8 @@ set(computenest_src src/model/DeleteServiceInstancesResult.cc src/model/GetServiceInstanceRequest.cc src/model/GetServiceInstanceResult.cc + src/model/GetServiceTemplateParameterConstraintsRequest.cc + src/model/GetServiceTemplateParameterConstraintsResult.cc src/model/ListServiceInstanceLogsRequest.cc src/model/ListServiceInstanceLogsResult.cc src/model/ListServiceInstanceResourcesRequest.cc diff --git a/computenest/include/alibabacloud/computenest/ComputeNestClient.h b/computenest/include/alibabacloud/computenest/ComputeNestClient.h index fbab12bce..968b2a124 100644 --- a/computenest/include/alibabacloud/computenest/ComputeNestClient.h +++ b/computenest/include/alibabacloud/computenest/ComputeNestClient.h @@ -22,6 +22,8 @@ #include #include #include "ComputeNestExport.h" +#include "model/ChangeResourceGroupRequest.h" +#include "model/ChangeResourceGroupResult.h" #include "model/ContinueDeployServiceInstanceRequest.h" #include "model/ContinueDeployServiceInstanceResult.h" #include "model/CreateServiceInstanceRequest.h" @@ -30,6 +32,8 @@ #include "model/DeleteServiceInstancesResult.h" #include "model/GetServiceInstanceRequest.h" #include "model/GetServiceInstanceResult.h" +#include "model/GetServiceTemplateParameterConstraintsRequest.h" +#include "model/GetServiceTemplateParameterConstraintsResult.h" #include "model/ListServiceInstanceLogsRequest.h" #include "model/ListServiceInstanceLogsResult.h" #include "model/ListServiceInstanceResourcesRequest.h" @@ -45,6 +49,9 @@ namespace AlibabaCloud class ALIBABACLOUD_COMPUTENEST_EXPORT ComputeNestClient : public RpcServiceClient { public: + typedef Outcome ChangeResourceGroupOutcome; + typedef std::future ChangeResourceGroupOutcomeCallable; + typedef std::function&)> ChangeResourceGroupAsyncHandler; typedef Outcome ContinueDeployServiceInstanceOutcome; typedef std::future ContinueDeployServiceInstanceOutcomeCallable; typedef std::function&)> ContinueDeployServiceInstanceAsyncHandler; @@ -57,6 +64,9 @@ namespace AlibabaCloud typedef Outcome GetServiceInstanceOutcome; typedef std::future GetServiceInstanceOutcomeCallable; typedef std::function&)> GetServiceInstanceAsyncHandler; + typedef Outcome GetServiceTemplateParameterConstraintsOutcome; + typedef std::future GetServiceTemplateParameterConstraintsOutcomeCallable; + typedef std::function&)> GetServiceTemplateParameterConstraintsAsyncHandler; typedef Outcome ListServiceInstanceLogsOutcome; typedef std::future ListServiceInstanceLogsOutcomeCallable; typedef std::function&)> ListServiceInstanceLogsAsyncHandler; @@ -71,6 +81,9 @@ namespace AlibabaCloud ComputeNestClient(const std::shared_ptr &credentialsProvider, const ClientConfiguration &configuration); ComputeNestClient(const std::string &accessKeyId, const std::string &accessKeySecret, const ClientConfiguration &configuration); ~ComputeNestClient(); + ChangeResourceGroupOutcome changeResourceGroup(const Model::ChangeResourceGroupRequest &request)const; + void changeResourceGroupAsync(const Model::ChangeResourceGroupRequest& request, const ChangeResourceGroupAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + ChangeResourceGroupOutcomeCallable changeResourceGroupCallable(const Model::ChangeResourceGroupRequest& request) const; ContinueDeployServiceInstanceOutcome continueDeployServiceInstance(const Model::ContinueDeployServiceInstanceRequest &request)const; void continueDeployServiceInstanceAsync(const Model::ContinueDeployServiceInstanceRequest& request, const ContinueDeployServiceInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ContinueDeployServiceInstanceOutcomeCallable continueDeployServiceInstanceCallable(const Model::ContinueDeployServiceInstanceRequest& request) const; @@ -83,6 +96,9 @@ namespace AlibabaCloud GetServiceInstanceOutcome getServiceInstance(const Model::GetServiceInstanceRequest &request)const; void getServiceInstanceAsync(const Model::GetServiceInstanceRequest& request, const GetServiceInstanceAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; GetServiceInstanceOutcomeCallable getServiceInstanceCallable(const Model::GetServiceInstanceRequest& request) const; + GetServiceTemplateParameterConstraintsOutcome getServiceTemplateParameterConstraints(const Model::GetServiceTemplateParameterConstraintsRequest &request)const; + void getServiceTemplateParameterConstraintsAsync(const Model::GetServiceTemplateParameterConstraintsRequest& request, const GetServiceTemplateParameterConstraintsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; + GetServiceTemplateParameterConstraintsOutcomeCallable getServiceTemplateParameterConstraintsCallable(const Model::GetServiceTemplateParameterConstraintsRequest& request) const; ListServiceInstanceLogsOutcome listServiceInstanceLogs(const Model::ListServiceInstanceLogsRequest &request)const; void listServiceInstanceLogsAsync(const Model::ListServiceInstanceLogsRequest& request, const ListServiceInstanceLogsAsyncHandler& handler, const std::shared_ptr& context = nullptr) const; ListServiceInstanceLogsOutcomeCallable listServiceInstanceLogsCallable(const Model::ListServiceInstanceLogsRequest& request) const; diff --git a/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupRequest.h b/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupRequest.h new file mode 100644 index 000000000..b928776f1 --- /dev/null +++ b/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupRequest.h @@ -0,0 +1,51 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#ifndef ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPREQUEST_H_ +#define ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace ComputeNest { +namespace Model { +class ALIBABACLOUD_COMPUTENEST_EXPORT ChangeResourceGroupRequest : public RpcServiceRequest { +public: + ChangeResourceGroupRequest(); + ~ChangeResourceGroupRequest(); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getResourceId() const; + void setResourceId(const std::string &resourceId); + std::string getResourceType() const; + void setResourceType(const std::string &resourceType); + std::string getNewResourceGroupId() const; + void setNewResourceGroupId(const std::string &newResourceGroupId); + +private: + std::string regionId_; + std::string resourceId_; + std::string resourceType_; + std::string newResourceGroupId_; +}; +} // namespace Model +} // namespace ComputeNest +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPREQUEST_H_ diff --git a/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupResult.h b/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupResult.h new file mode 100644 index 000000000..c6616d953 --- /dev/null +++ b/computenest/include/alibabacloud/computenest/model/ChangeResourceGroupResult.h @@ -0,0 +1,49 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#ifndef ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPRESULT_H_ +#define ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace ComputeNest + { + namespace Model + { + class ALIBABACLOUD_COMPUTENEST_EXPORT ChangeResourceGroupResult : public ServiceResult + { + public: + + + ChangeResourceGroupResult(); + explicit ChangeResourceGroupResult(const std::string &payload); + ~ChangeResourceGroupResult(); + + protected: + void parse(const std::string &payload); + private: + + }; + } + } +} +#endif // !ALIBABACLOUD_COMPUTENEST_MODEL_CHANGERESOURCEGROUPRESULT_H_ \ No newline at end of file diff --git a/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceRequest.h b/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceRequest.h index 572c69ea9..5ae0e2e3a 100644 --- a/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceRequest.h +++ b/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceRequest.h @@ -30,6 +30,8 @@ class ALIBABACLOUD_COMPUTENEST_EXPORT CreateServiceInstanceRequest : public RpcS public: struct Commodity { long payPeriod; + bool autoPay; + bool autoRenew; std::string payPeriodUnit; }; struct Tag { @@ -79,8 +81,6 @@ public: void setServiceId(const std::string &serviceId); std::string getParameters() const; void setParameters(const std::string ¶meters); - long getPayType() const; - void setPayType(long payType); OperationMetadata getOperationMetadata() const; void setOperationMetadata(const OperationMetadata &operationMetadata); @@ -102,7 +102,6 @@ private: std::string serviceVersion_; std::string serviceId_; std::string parameters_; - long payType_; OperationMetadata operationMetadata_; }; } // namespace Model diff --git a/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceResult.h b/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceResult.h index 3a3ffa610..1636afb78 100644 --- a/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceResult.h +++ b/computenest/include/alibabacloud/computenest/model/CreateServiceInstanceResult.h @@ -40,6 +40,7 @@ namespace AlibabaCloud std::string getStatus()const; std::string getServiceInstanceId()const; std::string getMarketInstanceId()const; + std::string getOrderId()const; protected: void parse(const std::string &payload); @@ -47,6 +48,7 @@ namespace AlibabaCloud std::string status_; std::string serviceInstanceId_; std::string marketInstanceId_; + std::string orderId_; }; } diff --git a/computenest/include/alibabacloud/computenest/model/GetServiceInstanceResult.h b/computenest/include/alibabacloud/computenest/model/GetServiceInstanceResult.h index aec98ea34..d083c4468 100644 --- a/computenest/include/alibabacloud/computenest/model/GetServiceInstanceResult.h +++ b/computenest/include/alibabacloud/computenest/model/GetServiceInstanceResult.h @@ -110,6 +110,7 @@ namespace AlibabaCloud std::string getOperationStartTime()const; std::string getServiceInstanceId()const; std::string getServiceType()const; + std::string getGrafanaDashBoardUrl()const; std::string getTemplateName()const; std::string getMarketInstanceId()const; std::vector getTags()const; @@ -120,6 +121,7 @@ namespace AlibabaCloud NetworkConfig getNetworkConfig()const; Service getService()const; std::string getPayType()const; + std::string getBizStatus()const; std::string getLicenseEndTime()const; long getUserId()const; bool getEnableUserPrometheus()const; @@ -145,6 +147,7 @@ namespace AlibabaCloud std::string operationStartTime_; std::string serviceInstanceId_; std::string serviceType_; + std::string grafanaDashBoardUrl_; std::string templateName_; std::string marketInstanceId_; std::vector tags_; @@ -155,6 +158,7 @@ namespace AlibabaCloud NetworkConfig networkConfig_; Service service_; std::string payType_; + std::string bizStatus_; std::string licenseEndTime_; long userId_; bool enableUserPrometheus_; diff --git a/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsRequest.h b/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsRequest.h new file mode 100644 index 000000000..d0fe44443 --- /dev/null +++ b/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsRequest.h @@ -0,0 +1,76 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#ifndef ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSREQUEST_H_ +#define ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSREQUEST_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud { +namespace ComputeNest { +namespace Model { +class ALIBABACLOUD_COMPUTENEST_EXPORT GetServiceTemplateParameterConstraintsRequest : public RpcServiceRequest { +public: + struct Parameters { + std::string parameterValue; + std::string parameterKey; + }; + GetServiceTemplateParameterConstraintsRequest(); + ~GetServiceTemplateParameterConstraintsRequest(); + std::string getClientToken() const; + void setClientToken(const std::string &clientToken); + bool getEnablePrivateVpcConnection() const; + void setEnablePrivateVpcConnection(bool enablePrivateVpcConnection); + std::string getRegionId() const; + void setRegionId(const std::string ®ionId); + std::string getTemplateName() const; + void setTemplateName(const std::string &templateName); + std::string getServiceInstanceId() const; + void setServiceInstanceId(const std::string &serviceInstanceId); + std::string getDeployRegionId() const; + void setDeployRegionId(const std::string &deployRegionId); + std::string getSpecificationName() const; + void setSpecificationName(const std::string &specificationName); + std::string getTrialType() const; + void setTrialType(const std::string &trialType); + std::string getServiceVersion() const; + void setServiceVersion(const std::string &serviceVersion); + std::string getServiceId() const; + void setServiceId(const std::string &serviceId); + std::vector getParameters() const; + void setParameters(const std::vector ¶meters); + +private: + std::string clientToken_; + bool enablePrivateVpcConnection_; + std::string regionId_; + std::string templateName_; + std::string serviceInstanceId_; + std::string deployRegionId_; + std::string specificationName_; + std::string trialType_; + std::string serviceVersion_; + std::string serviceId_; + std::vector parameters_; +}; +} // namespace Model +} // namespace ComputeNest +} // namespace AlibabaCloud +#endif // !ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSREQUEST_H_ diff --git a/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsResult.h b/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsResult.h new file mode 100644 index 000000000..a665a689a --- /dev/null +++ b/computenest/include/alibabacloud/computenest/model/GetServiceTemplateParameterConstraintsResult.h @@ -0,0 +1,77 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#ifndef ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSRESULT_H_ +#define ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSRESULT_H_ + +#include +#include +#include +#include +#include + +namespace AlibabaCloud +{ + namespace ComputeNest + { + namespace Model + { + class ALIBABACLOUD_COMPUTENEST_EXPORT GetServiceTemplateParameterConstraintsResult : public ServiceResult + { + public: + struct ParameterConstraintsItem + { + struct OriginalConstraintsItem + { + std::string propertyName; + std::string resourceName; + std::vector allowedValues1; + std::string resourceType; + }; + struct QueryErrorsItem + { + std::string resourceName; + std::string resourceType; + std::string errorMessage; + }; + std::string type; + std::vector allowedValues; + std::string behaviorReason; + std::vector associationParameterNames; + std::vector originalConstraints; + std::string behavior; + std::vector queryErrors; + std::string parameterKey; + }; + + + GetServiceTemplateParameterConstraintsResult(); + explicit GetServiceTemplateParameterConstraintsResult(const std::string &payload); + ~GetServiceTemplateParameterConstraintsResult(); + std::vector getParameterConstraints()const; + std::vector getFamilyConstraints()const; + + protected: + void parse(const std::string &payload); + private: + std::vector parameterConstraints_; + std::vector familyConstraints_; + + }; + } + } +} +#endif // !ALIBABACLOUD_COMPUTENEST_MODEL_GETSERVICETEMPLATEPARAMETERCONSTRAINTSRESULT_H_ \ No newline at end of file diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsRequest.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsRequest.h index 3527c09de..b9b9d91ce 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsRequest.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsRequest.h @@ -36,14 +36,20 @@ public: void setNextToken(const std::string &nextToken); std::string getServiceInstanceId() const; void setServiceInstanceId(const std::string &serviceInstanceId); - std::string getMaxResults() const; - void setMaxResults(const std::string &maxResults); + std::string getLogSource() const; + void setLogSource(const std::string &logSource); + int getMaxResults() const; + void setMaxResults(int maxResults); + std::string getLogstore() const; + void setLogstore(const std::string &logstore); private: std::string regionId_; std::string nextToken_; std::string serviceInstanceId_; - std::string maxResults_; + std::string logSource_; + int maxResults_; + std::string logstore_; }; } // namespace Model } // namespace ComputeNest diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsResult.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsResult.h index a6f54d20c..6677dfc0c 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsResult.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceLogsResult.h @@ -35,7 +35,6 @@ namespace AlibabaCloud struct ServiceInstanceLogs { std::string status; - std::string serviceInstanceId; std::string resourceId; std::string content; std::string logType; @@ -49,14 +48,14 @@ namespace AlibabaCloud explicit ListServiceInstanceLogsResult(const std::string &payload); ~ListServiceInstanceLogsResult(); std::string getNextToken()const; - std::string getMaxResults()const; + int getMaxResults()const; std::vector getServiceInstancesLogs()const; protected: void parse(const std::string &payload); private: std::string nextToken_; - std::string maxResults_; + int maxResults_; std::vector serviceInstancesLogs_; }; diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesRequest.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesRequest.h index c0a6c4fe2..274aba858 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesRequest.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesRequest.h @@ -40,6 +40,8 @@ public: void setNextToken(const std::string &nextToken); std::string getRegionId() const; void setRegionId(const std::string ®ionId); + std::string getServiceInstanceResourceType() const; + void setServiceInstanceResourceType(const std::string &serviceInstanceResourceType); std::vector getResourceARN() const; void setResourceARN(const std::vector &resourceARN); std::vector getTag() const; @@ -48,8 +50,8 @@ public: void setServiceInstanceId(const std::string &serviceInstanceId); std::string getExpireTimeStart() const; void setExpireTimeStart(const std::string &expireTimeStart); - std::string getMaxResults() const; - void setMaxResults(const std::string &maxResults); + int getMaxResults() const; + void setMaxResults(int maxResults); std::string getPayType() const; void setPayType(const std::string &payType); @@ -57,11 +59,12 @@ private: std::string expireTimeEnd_; std::string nextToken_; std::string regionId_; + std::string serviceInstanceResourceType_; std::vector resourceARN_; std::vector tag_; std::string serviceInstanceId_; std::string expireTimeStart_; - std::string maxResults_; + int maxResults_; std::string payType_; }; } // namespace Model diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesResult.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesResult.h index ac38f6fe4..709f31878 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesResult.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstanceResourcesResult.h @@ -34,6 +34,7 @@ namespace AlibabaCloud public: struct ResourcesItem { + std::string status; std::string resourceARN; std::string productCode; std::string renewalPeriodUnit; @@ -50,14 +51,14 @@ namespace AlibabaCloud explicit ListServiceInstanceResourcesResult(const std::string &payload); ~ListServiceInstanceResourcesResult(); std::string getNextToken()const; - std::string getMaxResults()const; + int getMaxResults()const; std::vector getResources()const; protected: void parse(const std::string &payload); private: std::string nextToken_; - std::string maxResults_; + int maxResults_; std::vector resources_; }; diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstancesRequest.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstancesRequest.h index b419b5738..8a117f3f7 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstancesRequest.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstancesRequest.h @@ -47,8 +47,8 @@ public: void setTag(const std::vector &tag); std::vector getFilter() const; void setFilter(const std::vector &filter); - std::string getMaxResults() const; - void setMaxResults(const std::string &maxResults); + int getMaxResults() const; + void setMaxResults(int maxResults); private: std::string resourceGroupId_; @@ -56,7 +56,7 @@ private: std::string nextToken_; std::vector tag_; std::vector filter_; - std::string maxResults_; + int maxResults_; }; } // namespace Model } // namespace ComputeNest diff --git a/computenest/include/alibabacloud/computenest/model/ListServiceInstancesResult.h b/computenest/include/alibabacloud/computenest/model/ListServiceInstancesResult.h index 91483709c..457ed2b9c 100644 --- a/computenest/include/alibabacloud/computenest/model/ListServiceInstancesResult.h +++ b/computenest/include/alibabacloud/computenest/model/ListServiceInstancesResult.h @@ -72,6 +72,7 @@ namespace AlibabaCloud std::string payType; std::string source; std::string name; + std::string bizStatus; std::string operationStartTime; std::string serviceInstanceId; std::string serviceType; @@ -91,7 +92,7 @@ namespace AlibabaCloud long getTotalCount()const; std::vector getServiceInstances()const; std::string getNextToken()const; - std::string getMaxResults()const; + int getMaxResults()const; protected: void parse(const std::string &payload); @@ -99,7 +100,7 @@ namespace AlibabaCloud long totalCount_; std::vector serviceInstances_; std::string nextToken_; - std::string maxResults_; + int maxResults_; }; } diff --git a/computenest/src/ComputeNestClient.cc b/computenest/src/ComputeNestClient.cc index 4604ecc62..a222cd425 100644 --- a/computenest/src/ComputeNestClient.cc +++ b/computenest/src/ComputeNestClient.cc @@ -51,6 +51,42 @@ ComputeNestClient::ComputeNestClient(const std::string & accessKeyId, const std: ComputeNestClient::~ComputeNestClient() {} +ComputeNestClient::ChangeResourceGroupOutcome ComputeNestClient::changeResourceGroup(const ChangeResourceGroupRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return ChangeResourceGroupOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return ChangeResourceGroupOutcome(ChangeResourceGroupResult(outcome.result())); + else + return ChangeResourceGroupOutcome(outcome.error()); +} + +void ComputeNestClient::changeResourceGroupAsync(const ChangeResourceGroupRequest& request, const ChangeResourceGroupAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, changeResourceGroup(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ComputeNestClient::ChangeResourceGroupOutcomeCallable ComputeNestClient::changeResourceGroupCallable(const ChangeResourceGroupRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->changeResourceGroup(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ComputeNestClient::ContinueDeployServiceInstanceOutcome ComputeNestClient::continueDeployServiceInstance(const ContinueDeployServiceInstanceRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); @@ -195,6 +231,42 @@ ComputeNestClient::GetServiceInstanceOutcomeCallable ComputeNestClient::getServi return task->get_future(); } +ComputeNestClient::GetServiceTemplateParameterConstraintsOutcome ComputeNestClient::getServiceTemplateParameterConstraints(const GetServiceTemplateParameterConstraintsRequest &request) const +{ + auto endpointOutcome = endpointProvider_->getEndpoint(); + if (!endpointOutcome.isSuccess()) + return GetServiceTemplateParameterConstraintsOutcome(endpointOutcome.error()); + + auto outcome = makeRequest(endpointOutcome.result(), request); + + if (outcome.isSuccess()) + return GetServiceTemplateParameterConstraintsOutcome(GetServiceTemplateParameterConstraintsResult(outcome.result())); + else + return GetServiceTemplateParameterConstraintsOutcome(outcome.error()); +} + +void ComputeNestClient::getServiceTemplateParameterConstraintsAsync(const GetServiceTemplateParameterConstraintsRequest& request, const GetServiceTemplateParameterConstraintsAsyncHandler& handler, const std::shared_ptr& context) const +{ + auto fn = [this, request, handler, context]() + { + handler(this, request, getServiceTemplateParameterConstraints(request), context); + }; + + asyncExecute(new Runnable(fn)); +} + +ComputeNestClient::GetServiceTemplateParameterConstraintsOutcomeCallable ComputeNestClient::getServiceTemplateParameterConstraintsCallable(const GetServiceTemplateParameterConstraintsRequest &request) const +{ + auto task = std::make_shared>( + [this, request]() + { + return this->getServiceTemplateParameterConstraints(request); + }); + + asyncExecute(new Runnable([task]() { (*task)(); })); + return task->get_future(); +} + ComputeNestClient::ListServiceInstanceLogsOutcome ComputeNestClient::listServiceInstanceLogs(const ListServiceInstanceLogsRequest &request) const { auto endpointOutcome = endpointProvider_->getEndpoint(); diff --git a/computenest/src/model/ChangeResourceGroupRequest.cc b/computenest/src/model/ChangeResourceGroupRequest.cc new file mode 100644 index 000000000..c7a64a994 --- /dev/null +++ b/computenest/src/model/ChangeResourceGroupRequest.cc @@ -0,0 +1,63 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#include + +using AlibabaCloud::ComputeNest::Model::ChangeResourceGroupRequest; + +ChangeResourceGroupRequest::ChangeResourceGroupRequest() + : RpcServiceRequest("computenest", "2021-06-01", "ChangeResourceGroup") { + setMethod(HttpRequest::Method::Post); +} + +ChangeResourceGroupRequest::~ChangeResourceGroupRequest() {} + +std::string ChangeResourceGroupRequest::getRegionId() const { + return regionId_; +} + +void ChangeResourceGroupRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string ChangeResourceGroupRequest::getResourceId() const { + return resourceId_; +} + +void ChangeResourceGroupRequest::setResourceId(const std::string &resourceId) { + resourceId_ = resourceId; + setParameter(std::string("ResourceId"), resourceId); +} + +std::string ChangeResourceGroupRequest::getResourceType() const { + return resourceType_; +} + +void ChangeResourceGroupRequest::setResourceType(const std::string &resourceType) { + resourceType_ = resourceType; + setParameter(std::string("ResourceType"), resourceType); +} + +std::string ChangeResourceGroupRequest::getNewResourceGroupId() const { + return newResourceGroupId_; +} + +void ChangeResourceGroupRequest::setNewResourceGroupId(const std::string &newResourceGroupId) { + newResourceGroupId_ = newResourceGroupId; + setParameter(std::string("NewResourceGroupId"), newResourceGroupId); +} + diff --git a/computenest/src/model/ChangeResourceGroupResult.cc b/computenest/src/model/ChangeResourceGroupResult.cc new file mode 100644 index 000000000..e19c63a6d --- /dev/null +++ b/computenest/src/model/ChangeResourceGroupResult.cc @@ -0,0 +1,44 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#include +#include + +using namespace AlibabaCloud::ComputeNest; +using namespace AlibabaCloud::ComputeNest::Model; + +ChangeResourceGroupResult::ChangeResourceGroupResult() : + ServiceResult() +{} + +ChangeResourceGroupResult::ChangeResourceGroupResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +ChangeResourceGroupResult::~ChangeResourceGroupResult() +{} + +void ChangeResourceGroupResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + +} + diff --git a/computenest/src/model/CreateServiceInstanceRequest.cc b/computenest/src/model/CreateServiceInstanceRequest.cc index 73fbb1423..b2810bf80 100644 --- a/computenest/src/model/CreateServiceInstanceRequest.cc +++ b/computenest/src/model/CreateServiceInstanceRequest.cc @@ -32,6 +32,8 @@ CreateServiceInstanceRequest::Commodity CreateServiceInstanceRequest::getCommodi void CreateServiceInstanceRequest::setCommodity(const CreateServiceInstanceRequest::Commodity &commodity) { commodity_ = commodity; setParameter(std::string("Commodity") + ".PayPeriod", std::to_string(commodity.payPeriod)); + setParameter(std::string("Commodity") + ".AutoPay", commodity.autoPay ? "true" : "false"); + setParameter(std::string("Commodity") + ".AutoRenew", commodity.autoRenew ? "true" : "false"); setParameter(std::string("Commodity") + ".PayPeriodUnit", commodity.payPeriodUnit); } @@ -184,15 +186,6 @@ void CreateServiceInstanceRequest::setParameters(const std::string ¶meters) setParameter(std::string("Parameters"), parameters); } -long CreateServiceInstanceRequest::getPayType() const { - return payType_; -} - -void CreateServiceInstanceRequest::setPayType(long payType) { - payType_ = payType; - setParameter(std::string("PayType"), std::to_string(payType)); -} - CreateServiceInstanceRequest::OperationMetadata CreateServiceInstanceRequest::getOperationMetadata() const { return operationMetadata_; } diff --git a/computenest/src/model/CreateServiceInstanceResult.cc b/computenest/src/model/CreateServiceInstanceResult.cc index 180efe073..ab75fef40 100644 --- a/computenest/src/model/CreateServiceInstanceResult.cc +++ b/computenest/src/model/CreateServiceInstanceResult.cc @@ -45,6 +45,8 @@ void CreateServiceInstanceResult::parse(const std::string &payload) serviceInstanceId_ = value["ServiceInstanceId"].asString(); if(!value["MarketInstanceId"].isNull()) marketInstanceId_ = value["MarketInstanceId"].asString(); + if(!value["OrderId"].isNull()) + orderId_ = value["OrderId"].asString(); } @@ -63,3 +65,8 @@ std::string CreateServiceInstanceResult::getMarketInstanceId()const return marketInstanceId_; } +std::string CreateServiceInstanceResult::getOrderId()const +{ + return orderId_; +} + diff --git a/computenest/src/model/GetServiceInstanceResult.cc b/computenest/src/model/GetServiceInstanceResult.cc index f9c5b35d9..277860c9b 100644 --- a/computenest/src/model/GetServiceInstanceResult.cc +++ b/computenest/src/model/GetServiceInstanceResult.cc @@ -203,6 +203,10 @@ void GetServiceInstanceResult::parse(const std::string &payload) marketInstanceId_ = value["MarketInstanceId"].asString(); if(!value["ResourceGroupId"].isNull()) resourceGroupId_ = value["ResourceGroupId"].asString(); + if(!value["BizStatus"].isNull()) + bizStatus_ = value["BizStatus"].asString(); + if(!value["GrafanaDashBoardUrl"].isNull()) + grafanaDashBoardUrl_ = value["GrafanaDashBoardUrl"].asString(); } @@ -266,6 +270,11 @@ std::string GetServiceInstanceResult::getServiceType()const return serviceType_; } +std::string GetServiceInstanceResult::getGrafanaDashBoardUrl()const +{ + return grafanaDashBoardUrl_; +} + std::string GetServiceInstanceResult::getTemplateName()const { return templateName_; @@ -316,6 +325,11 @@ std::string GetServiceInstanceResult::getPayType()const return payType_; } +std::string GetServiceInstanceResult::getBizStatus()const +{ + return bizStatus_; +} + std::string GetServiceInstanceResult::getLicenseEndTime()const { return licenseEndTime_; diff --git a/computenest/src/model/GetServiceTemplateParameterConstraintsRequest.cc b/computenest/src/model/GetServiceTemplateParameterConstraintsRequest.cc new file mode 100644 index 000000000..bd24b23a6 --- /dev/null +++ b/computenest/src/model/GetServiceTemplateParameterConstraintsRequest.cc @@ -0,0 +1,131 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#include + +using AlibabaCloud::ComputeNest::Model::GetServiceTemplateParameterConstraintsRequest; + +GetServiceTemplateParameterConstraintsRequest::GetServiceTemplateParameterConstraintsRequest() + : RpcServiceRequest("computenest", "2021-06-01", "GetServiceTemplateParameterConstraints") { + setMethod(HttpRequest::Method::Post); +} + +GetServiceTemplateParameterConstraintsRequest::~GetServiceTemplateParameterConstraintsRequest() {} + +std::string GetServiceTemplateParameterConstraintsRequest::getClientToken() const { + return clientToken_; +} + +void GetServiceTemplateParameterConstraintsRequest::setClientToken(const std::string &clientToken) { + clientToken_ = clientToken; + setParameter(std::string("ClientToken"), clientToken); +} + +bool GetServiceTemplateParameterConstraintsRequest::getEnablePrivateVpcConnection() const { + return enablePrivateVpcConnection_; +} + +void GetServiceTemplateParameterConstraintsRequest::setEnablePrivateVpcConnection(bool enablePrivateVpcConnection) { + enablePrivateVpcConnection_ = enablePrivateVpcConnection; + setParameter(std::string("EnablePrivateVpcConnection"), enablePrivateVpcConnection ? "true" : "false"); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getRegionId() const { + return regionId_; +} + +void GetServiceTemplateParameterConstraintsRequest::setRegionId(const std::string ®ionId) { + regionId_ = regionId; + setParameter(std::string("RegionId"), regionId); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getTemplateName() const { + return templateName_; +} + +void GetServiceTemplateParameterConstraintsRequest::setTemplateName(const std::string &templateName) { + templateName_ = templateName; + setParameter(std::string("TemplateName"), templateName); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getServiceInstanceId() const { + return serviceInstanceId_; +} + +void GetServiceTemplateParameterConstraintsRequest::setServiceInstanceId(const std::string &serviceInstanceId) { + serviceInstanceId_ = serviceInstanceId; + setParameter(std::string("ServiceInstanceId"), serviceInstanceId); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getDeployRegionId() const { + return deployRegionId_; +} + +void GetServiceTemplateParameterConstraintsRequest::setDeployRegionId(const std::string &deployRegionId) { + deployRegionId_ = deployRegionId; + setParameter(std::string("DeployRegionId"), deployRegionId); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getSpecificationName() const { + return specificationName_; +} + +void GetServiceTemplateParameterConstraintsRequest::setSpecificationName(const std::string &specificationName) { + specificationName_ = specificationName; + setParameter(std::string("SpecificationName"), specificationName); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getTrialType() const { + return trialType_; +} + +void GetServiceTemplateParameterConstraintsRequest::setTrialType(const std::string &trialType) { + trialType_ = trialType; + setParameter(std::string("TrialType"), trialType); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getServiceVersion() const { + return serviceVersion_; +} + +void GetServiceTemplateParameterConstraintsRequest::setServiceVersion(const std::string &serviceVersion) { + serviceVersion_ = serviceVersion; + setParameter(std::string("ServiceVersion"), serviceVersion); +} + +std::string GetServiceTemplateParameterConstraintsRequest::getServiceId() const { + return serviceId_; +} + +void GetServiceTemplateParameterConstraintsRequest::setServiceId(const std::string &serviceId) { + serviceId_ = serviceId; + setParameter(std::string("ServiceId"), serviceId); +} + +std::vector GetServiceTemplateParameterConstraintsRequest::getParameters() const { + return parameters_; +} + +void GetServiceTemplateParameterConstraintsRequest::setParameters(const std::vector ¶meters) { + parameters_ = parameters; + for(int dep1 = 0; dep1 != parameters.size(); dep1++) { + auto parametersObj = parameters.at(dep1); + std::string parametersObjStr = std::string("Parameters") + "." + std::to_string(dep1 + 1); + setParameter(parametersObjStr + ".ParameterValue", parametersObj.parameterValue); + setParameter(parametersObjStr + ".ParameterKey", parametersObj.parameterKey); + } +} + diff --git a/computenest/src/model/GetServiceTemplateParameterConstraintsResult.cc b/computenest/src/model/GetServiceTemplateParameterConstraintsResult.cc new file mode 100644 index 000000000..c0e92b670 --- /dev/null +++ b/computenest/src/model/GetServiceTemplateParameterConstraintsResult.cc @@ -0,0 +1,104 @@ +/* + * Copyright 2009-2017 Alibaba Cloud All rights reserved. + * + * 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. + */ + +#include +#include + +using namespace AlibabaCloud::ComputeNest; +using namespace AlibabaCloud::ComputeNest::Model; + +GetServiceTemplateParameterConstraintsResult::GetServiceTemplateParameterConstraintsResult() : + ServiceResult() +{} + +GetServiceTemplateParameterConstraintsResult::GetServiceTemplateParameterConstraintsResult(const std::string &payload) : + ServiceResult() +{ + parse(payload); +} + +GetServiceTemplateParameterConstraintsResult::~GetServiceTemplateParameterConstraintsResult() +{} + +void GetServiceTemplateParameterConstraintsResult::parse(const std::string &payload) +{ + Json::Reader reader; + Json::Value value; + reader.parse(payload, value); + setRequestId(value["RequestId"].asString()); + auto allParameterConstraintsNode = value["ParameterConstraints"]["ParameterConstraintsItem"]; + for (auto valueParameterConstraintsParameterConstraintsItem : allParameterConstraintsNode) + { + ParameterConstraintsItem parameterConstraintsObject; + if(!valueParameterConstraintsParameterConstraintsItem["Type"].isNull()) + parameterConstraintsObject.type = valueParameterConstraintsParameterConstraintsItem["Type"].asString(); + if(!valueParameterConstraintsParameterConstraintsItem["ParameterKey"].isNull()) + parameterConstraintsObject.parameterKey = valueParameterConstraintsParameterConstraintsItem["ParameterKey"].asString(); + if(!valueParameterConstraintsParameterConstraintsItem["Behavior"].isNull()) + parameterConstraintsObject.behavior = valueParameterConstraintsParameterConstraintsItem["Behavior"].asString(); + if(!valueParameterConstraintsParameterConstraintsItem["BehaviorReason"].isNull()) + parameterConstraintsObject.behaviorReason = valueParameterConstraintsParameterConstraintsItem["BehaviorReason"].asString(); + auto allOriginalConstraintsNode = valueParameterConstraintsParameterConstraintsItem["OriginalConstraints"]["OriginalConstraintsItem"]; + for (auto valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem : allOriginalConstraintsNode) + { + ParameterConstraintsItem::OriginalConstraintsItem originalConstraintsObject; + if(!valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["PropertyName"].isNull()) + originalConstraintsObject.propertyName = valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["PropertyName"].asString(); + if(!valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["ResourceName"].isNull()) + originalConstraintsObject.resourceName = valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["ResourceName"].asString(); + if(!valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["ResourceType"].isNull()) + originalConstraintsObject.resourceType = valueParameterConstraintsParameterConstraintsItemOriginalConstraintsOriginalConstraintsItem["ResourceType"].asString(); + auto allAllowedValues1 = value["AllowedValues"]["AllowedValues"]; + for (auto value : allAllowedValues1) + originalConstraintsObject.allowedValues1.push_back(value.asString()); + parameterConstraintsObject.originalConstraints.push_back(originalConstraintsObject); + } + auto allQueryErrorsNode = valueParameterConstraintsParameterConstraintsItem["QueryErrors"]["QueryErrorsItem"]; + for (auto valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem : allQueryErrorsNode) + { + ParameterConstraintsItem::QueryErrorsItem queryErrorsObject; + if(!valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ErrorMessage"].isNull()) + queryErrorsObject.errorMessage = valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ErrorMessage"].asString(); + if(!valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ResourceName"].isNull()) + queryErrorsObject.resourceName = valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ResourceName"].asString(); + if(!valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ResourceType"].isNull()) + queryErrorsObject.resourceType = valueParameterConstraintsParameterConstraintsItemQueryErrorsQueryErrorsItem["ResourceType"].asString(); + parameterConstraintsObject.queryErrors.push_back(queryErrorsObject); + } + auto allAllowedValues = value["AllowedValues"]["AllowedValues"]; + for (auto value : allAllowedValues) + parameterConstraintsObject.allowedValues.push_back(value.asString()); + auto allAssociationParameterNames = value["AssociationParameterNames"]["AssociationParameterNames"]; + for (auto value : allAssociationParameterNames) + parameterConstraintsObject.associationParameterNames.push_back(value.asString()); + parameterConstraints_.push_back(parameterConstraintsObject); + } + auto allFamilyConstraints = value["FamilyConstraints"]["PamilyConstraints"]; + for (const auto &item : allFamilyConstraints) + familyConstraints_.push_back(item.asString()); + +} + +std::vector GetServiceTemplateParameterConstraintsResult::getParameterConstraints()const +{ + return parameterConstraints_; +} + +std::vector GetServiceTemplateParameterConstraintsResult::getFamilyConstraints()const +{ + return familyConstraints_; +} + diff --git a/computenest/src/model/ListServiceInstanceLogsRequest.cc b/computenest/src/model/ListServiceInstanceLogsRequest.cc index d560a28e6..dd03e256a 100644 --- a/computenest/src/model/ListServiceInstanceLogsRequest.cc +++ b/computenest/src/model/ListServiceInstanceLogsRequest.cc @@ -52,12 +52,30 @@ void ListServiceInstanceLogsRequest::setServiceInstanceId(const std::string &ser setParameter(std::string("ServiceInstanceId"), serviceInstanceId); } -std::string ListServiceInstanceLogsRequest::getMaxResults() const { +std::string ListServiceInstanceLogsRequest::getLogSource() const { + return logSource_; +} + +void ListServiceInstanceLogsRequest::setLogSource(const std::string &logSource) { + logSource_ = logSource; + setParameter(std::string("LogSource"), logSource); +} + +int ListServiceInstanceLogsRequest::getMaxResults() const { return maxResults_; } -void ListServiceInstanceLogsRequest::setMaxResults(const std::string &maxResults) { +void ListServiceInstanceLogsRequest::setMaxResults(int maxResults) { maxResults_ = maxResults; - setParameter(std::string("MaxResults"), maxResults); + setParameter(std::string("MaxResults"), std::to_string(maxResults)); +} + +std::string ListServiceInstanceLogsRequest::getLogstore() const { + return logstore_; +} + +void ListServiceInstanceLogsRequest::setLogstore(const std::string &logstore) { + logstore_ = logstore; + setParameter(std::string("Logstore"), logstore); } diff --git a/computenest/src/model/ListServiceInstanceLogsResult.cc b/computenest/src/model/ListServiceInstanceLogsResult.cc index 015490760..45e568ef2 100644 --- a/computenest/src/model/ListServiceInstanceLogsResult.cc +++ b/computenest/src/model/ListServiceInstanceLogsResult.cc @@ -45,8 +45,6 @@ void ListServiceInstanceLogsResult::parse(const std::string &payload) ServiceInstanceLogs serviceInstancesLogsObject; if(!valueServiceInstancesLogsServiceInstanceLogs["Timestamp"].isNull()) serviceInstancesLogsObject.timestamp = valueServiceInstancesLogsServiceInstanceLogs["Timestamp"].asString(); - if(!valueServiceInstancesLogsServiceInstanceLogs["ServiceInstanceId"].isNull()) - serviceInstancesLogsObject.serviceInstanceId = valueServiceInstancesLogsServiceInstanceLogs["ServiceInstanceId"].asString(); if(!valueServiceInstancesLogsServiceInstanceLogs["Source"].isNull()) serviceInstancesLogsObject.source = valueServiceInstancesLogsServiceInstanceLogs["Source"].asString(); if(!valueServiceInstancesLogsServiceInstanceLogs["Content"].isNull()) @@ -64,7 +62,7 @@ void ListServiceInstanceLogsResult::parse(const std::string &payload) if(!value["NextToken"].isNull()) nextToken_ = value["NextToken"].asString(); if(!value["MaxResults"].isNull()) - maxResults_ = value["MaxResults"].asString(); + maxResults_ = std::stoi(value["MaxResults"].asString()); } @@ -73,7 +71,7 @@ std::string ListServiceInstanceLogsResult::getNextToken()const return nextToken_; } -std::string ListServiceInstanceLogsResult::getMaxResults()const +int ListServiceInstanceLogsResult::getMaxResults()const { return maxResults_; } diff --git a/computenest/src/model/ListServiceInstanceResourcesRequest.cc b/computenest/src/model/ListServiceInstanceResourcesRequest.cc index 1c24eb281..372b20ec4 100644 --- a/computenest/src/model/ListServiceInstanceResourcesRequest.cc +++ b/computenest/src/model/ListServiceInstanceResourcesRequest.cc @@ -52,6 +52,15 @@ void ListServiceInstanceResourcesRequest::setRegionId(const std::string ®ionI setParameter(std::string("RegionId"), regionId); } +std::string ListServiceInstanceResourcesRequest::getServiceInstanceResourceType() const { + return serviceInstanceResourceType_; +} + +void ListServiceInstanceResourcesRequest::setServiceInstanceResourceType(const std::string &serviceInstanceResourceType) { + serviceInstanceResourceType_ = serviceInstanceResourceType; + setParameter(std::string("ServiceInstanceResourceType"), serviceInstanceResourceType); +} + std::vector ListServiceInstanceResourcesRequest::getResourceARN() const { return resourceARN_; } @@ -92,13 +101,13 @@ void ListServiceInstanceResourcesRequest::setExpireTimeStart(const std::string & setParameter(std::string("ExpireTimeStart"), expireTimeStart); } -std::string ListServiceInstanceResourcesRequest::getMaxResults() const { +int ListServiceInstanceResourcesRequest::getMaxResults() const { return maxResults_; } -void ListServiceInstanceResourcesRequest::setMaxResults(const std::string &maxResults) { +void ListServiceInstanceResourcesRequest::setMaxResults(int maxResults) { maxResults_ = maxResults; - setParameter(std::string("MaxResults"), maxResults); + setParameter(std::string("MaxResults"), std::to_string(maxResults)); } std::string ListServiceInstanceResourcesRequest::getPayType() const { diff --git a/computenest/src/model/ListServiceInstanceResourcesResult.cc b/computenest/src/model/ListServiceInstanceResourcesResult.cc index 405e8c034..38b1360bf 100644 --- a/computenest/src/model/ListServiceInstanceResourcesResult.cc +++ b/computenest/src/model/ListServiceInstanceResourcesResult.cc @@ -61,12 +61,14 @@ void ListServiceInstanceResourcesResult::parse(const std::string &payload) resourcesObject.productType = valueResourcesResourcesItem["ProductType"].asString(); if(!valueResourcesResourcesItem["ProductCode"].isNull()) resourcesObject.productCode = valueResourcesResourcesItem["ProductCode"].asString(); + if(!valueResourcesResourcesItem["Status"].isNull()) + resourcesObject.status = valueResourcesResourcesItem["Status"].asString(); resources_.push_back(resourcesObject); } if(!value["NextToken"].isNull()) nextToken_ = value["NextToken"].asString(); if(!value["MaxResults"].isNull()) - maxResults_ = value["MaxResults"].asString(); + maxResults_ = std::stoi(value["MaxResults"].asString()); } @@ -75,7 +77,7 @@ std::string ListServiceInstanceResourcesResult::getNextToken()const return nextToken_; } -std::string ListServiceInstanceResourcesResult::getMaxResults()const +int ListServiceInstanceResourcesResult::getMaxResults()const { return maxResults_; } diff --git a/computenest/src/model/ListServiceInstancesRequest.cc b/computenest/src/model/ListServiceInstancesRequest.cc index b265b9c94..9f9a65494 100644 --- a/computenest/src/model/ListServiceInstancesRequest.cc +++ b/computenest/src/model/ListServiceInstancesRequest.cc @@ -79,12 +79,12 @@ void ListServiceInstancesRequest::setFilter(const std::vector