diff --git a/CHANGELOG.md b/CHANGELOG.md index e739ac598..50f79482c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,131 @@ +# 3.1.107 2024-10-24 + +### HuaweiCloud SDK DRS + +- _API Version_ + - V5 +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **ListAsyncJobDetail** + - changes of response param + - `+ jobs.compare_result.data_compare_task_list.options` + - `+ jobs.compare_result.data_compare_task_list.dynamic_compare_delay` + - **ShowJobDetail** + - changes of response param + - `+ job.compare_result.data_compare_task_list.options` + - `+ job.compare_result.data_compare_task_list.dynamic_compare_delay` + +### HuaweiCloud SDK GaussDB + +- _API Version_ + - V3 +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **CheckTableConfig** + - changes of request param + - `+ target_database_name` + - `+ is_create_task` + +### HuaweiCloud SDK RAM + +- _API Version_ + - V1 +- _Features_ + - None +- _Bug Fix_ + - None +- _Change_ + - **EnableOrganizationShare** + - changes of request param + - `+ X-Security-Token` + - **DisableOrganizationShare** + - changes of request param + - `+ X-Security-Token` + - **ShowOrganizationShare** + - changes of request param + - `+ X-Security-Token` + - **AssociateResourceSharePermission** + - changes of request param + - `+ X-Security-Token` + - **DisassociateResourceSharePermission** + - changes of request param + - `+ X-Security-Token` + - **AcceptResourceShareInvitation** + - changes of request param + - `+ X-Security-Token` + - **RejectResourceShareInvitation** + - changes of request param + - `+ X-Security-Token` + - **SearchResourceShareInvitation** + - changes of request param + - `+ X-Security-Token` + - **ListPermissions** + - changes of request param + - `+ X-Security-Token` + - **ShowPermission** + - changes of request param + - `+ X-Security-Token` + - **AssociateResourceShare** + - changes of request param + - `+ X-Security-Token` + - **DisassociateResourceShare** + - changes of request param + - `+ X-Security-Token` + - **SearchResourceShareAssociations** + - changes of request param + - `+ X-Security-Token` + - **ListResourceShareTags** + - changes of request param + - `+ X-Security-Token` + - **SearchResourceShareCountByTags** + - changes of request param + - `+ X-Security-Token` + - **BatchCreateResourceShareTags** + - changes of request param + - `+ X-Security-Token` + - **BatchDeleteResourceShareTags** + - changes of request param + - `+ X-Security-Token` + - **ListResourceSharePermissions** + - changes of request param + - `+ X-Security-Token` + - **SearchSharedResources** + - changes of request param + - `+ X-Security-Token` + - **SearchSharedPrincipals** + - changes of request param + - `+ X-Security-Token` + - **ListResourceTypes** + - changes of request param + - `+ X-Security-Token` + - **ListPermissionVersions** + - changes of request param + - `+ X-Security-Token` + - **CreateResourceShare** + - changes of request param + - `+ X-Security-Token` + - **SearchResourceShares** + - changes of request param + - `+ X-Security-Token` + - **DeleteResourceShare** + - changes of request param + - `+ X-Security-Token` + - **UpdateResourceShare** + - changes of request param + - `+ X-Security-Token` + - **ListResourceSharesByTags** + - changes of request param + - `+ X-Security-Token` + - **ListQuota** + - changes of request param + - `+ X-Security-Token` + # 3.1.106 2024-10-17 ### HuaweiCloud SDK CDN diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md index 996348fe2..febce57ae 100644 --- a/CHANGELOG_CN.md +++ b/CHANGELOG_CN.md @@ -1,3 +1,131 @@ +# 3.1.107 2024-10-24 + +### HuaweiCloud SDK DRS + +- _接口版本_ + - V5 +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **ListAsyncJobDetail** + - 响应参数变更 + - `+ jobs.compare_result.data_compare_task_list.options` + - `+ jobs.compare_result.data_compare_task_list.dynamic_compare_delay` + - **ShowJobDetail** + - 响应参数变更 + - `+ job.compare_result.data_compare_task_list.options` + - `+ job.compare_result.data_compare_task_list.dynamic_compare_delay` + +### HuaweiCloud SDK GaussDB + +- _接口版本_ + - V3 +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **CheckTableConfig** + - 请求参数变更 + - `+ target_database_name` + - `+ is_create_task` + +### HuaweiCloud SDK RAM + +- _接口版本_ + - V1 +- _新增特性_ + - 无 +- _解决问题_ + - 无 +- _特性变更_ + - **EnableOrganizationShare** + - 请求参数变更 + - `+ X-Security-Token` + - **DisableOrganizationShare** + - 请求参数变更 + - `+ X-Security-Token` + - **ShowOrganizationShare** + - 请求参数变更 + - `+ X-Security-Token` + - **AssociateResourceSharePermission** + - 请求参数变更 + - `+ X-Security-Token` + - **DisassociateResourceSharePermission** + - 请求参数变更 + - `+ X-Security-Token` + - **AcceptResourceShareInvitation** + - 请求参数变更 + - `+ X-Security-Token` + - **RejectResourceShareInvitation** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchResourceShareInvitation** + - 请求参数变更 + - `+ X-Security-Token` + - **ListPermissions** + - 请求参数变更 + - `+ X-Security-Token` + - **ShowPermission** + - 请求参数变更 + - `+ X-Security-Token` + - **AssociateResourceShare** + - 请求参数变更 + - `+ X-Security-Token` + - **DisassociateResourceShare** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchResourceShareAssociations** + - 请求参数变更 + - `+ X-Security-Token` + - **ListResourceShareTags** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchResourceShareCountByTags** + - 请求参数变更 + - `+ X-Security-Token` + - **BatchCreateResourceShareTags** + - 请求参数变更 + - `+ X-Security-Token` + - **BatchDeleteResourceShareTags** + - 请求参数变更 + - `+ X-Security-Token` + - **ListResourceSharePermissions** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchSharedResources** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchSharedPrincipals** + - 请求参数变更 + - `+ X-Security-Token` + - **ListResourceTypes** + - 请求参数变更 + - `+ X-Security-Token` + - **ListPermissionVersions** + - 请求参数变更 + - `+ X-Security-Token` + - **CreateResourceShare** + - 请求参数变更 + - `+ X-Security-Token` + - **SearchResourceShares** + - 请求参数变更 + - `+ X-Security-Token` + - **DeleteResourceShare** + - 请求参数变更 + - `+ X-Security-Token` + - **UpdateResourceShare** + - 请求参数变更 + - `+ X-Security-Token` + - **ListResourceSharesByTags** + - 请求参数变更 + - `+ X-Security-Token` + - **ListQuota** + - 请求参数变更 + - `+ X-Security-Token` + # 3.1.106 2024-10-17 ### HuaweiCloud SDK CDN diff --git a/VERSION b/VERSION index 563256ec9..929b79462 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.1.106 +3.1.107 diff --git a/drs/include/huaweicloud/drs/v5/model/CompareJobInfo.h b/drs/include/huaweicloud/drs/v5/model/CompareJobInfo.h index 52e483572..e7f140909 100644 --- a/drs/include/huaweicloud/drs/v5/model/CompareJobInfo.h +++ b/drs/include/huaweicloud/drs/v5/model/CompareJobInfo.h @@ -121,6 +121,15 @@ class HUAWEICLOUD_DRS_V5_EXPORT CompareJobInfo void unsetcompareJobTag(); void setCompareJobTag(const std::map& value); + /// + /// 对比任务选项。 + /// + + std::map& getOptions(); + bool optionsIsSet() const; + void unsetoptions(); + void setOptions(const std::map& value); + /// /// 失败原因。 /// @@ -130,6 +139,15 @@ class HUAWEICLOUD_DRS_V5_EXPORT CompareJobInfo void unseterrorMsg(); void setErrorMsg(const std::string& value); + /// + /// 动态比对时延。 + /// + + int64_t getDynamicCompareDelay() const; + bool dynamicCompareDelayIsSet() const; + void unsetdynamicCompareDelay(); + void setDynamicCompareDelay(int64_t value); + protected: std::string id_; @@ -150,8 +168,12 @@ class HUAWEICLOUD_DRS_V5_EXPORT CompareJobInfo bool reportRemainSecondsIsSet_; std::map compareJobTag_; bool compareJobTagIsSet_; + std::map options_; + bool optionsIsSet_; std::string errorMsg_; bool errorMsgIsSet_; + int64_t dynamicCompareDelay_; + bool dynamicCompareDelayIsSet_; }; diff --git a/drs/src/v5/model/CompareJobInfo.cpp b/drs/src/v5/model/CompareJobInfo.cpp index f6476b7a0..478b99831 100644 --- a/drs/src/v5/model/CompareJobInfo.cpp +++ b/drs/src/v5/model/CompareJobInfo.cpp @@ -29,8 +29,11 @@ CompareJobInfo::CompareJobInfo() reportRemainSeconds_ = ""; reportRemainSecondsIsSet_ = false; compareJobTagIsSet_ = false; + optionsIsSet_ = false; errorMsg_ = ""; errorMsgIsSet_ = false; + dynamicCompareDelay_ = 0L; + dynamicCompareDelayIsSet_ = false; } CompareJobInfo::~CompareJobInfo() = default; @@ -70,9 +73,15 @@ web::json::value CompareJobInfo::toJson() const if(compareJobTagIsSet_) { val[utility::conversions::to_string_t("compare_job_tag")] = ModelBase::toJson(compareJobTag_); } + if(optionsIsSet_) { + val[utility::conversions::to_string_t("options")] = ModelBase::toJson(options_); + } if(errorMsgIsSet_) { val[utility::conversions::to_string_t("error_msg")] = ModelBase::toJson(errorMsg_); } + if(dynamicCompareDelayIsSet_) { + val[utility::conversions::to_string_t("dynamic_compare_delay")] = ModelBase::toJson(dynamicCompareDelay_); + } return val; } @@ -161,6 +170,15 @@ bool CompareJobInfo::fromJson(const web::json::value& val) setCompareJobTag(refVal); } } + if(val.has_field(utility::conversions::to_string_t("options"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("options")); + if(!fieldValue.is_null()) + { + std::map refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setOptions(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("error_msg"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("error_msg")); if(!fieldValue.is_null()) @@ -170,6 +188,15 @@ bool CompareJobInfo::fromJson(const web::json::value& val) setErrorMsg(refVal); } } + if(val.has_field(utility::conversions::to_string_t("dynamic_compare_delay"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("dynamic_compare_delay")); + if(!fieldValue.is_null()) + { + int64_t refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setDynamicCompareDelay(refVal); + } + } return ok; } @@ -363,6 +390,27 @@ void CompareJobInfo::unsetcompareJobTag() compareJobTagIsSet_ = false; } +std::map& CompareJobInfo::getOptions() +{ + return options_; +} + +void CompareJobInfo::setOptions(const std::map& value) +{ + options_ = value; + optionsIsSet_ = true; +} + +bool CompareJobInfo::optionsIsSet() const +{ + return optionsIsSet_; +} + +void CompareJobInfo::unsetoptions() +{ + optionsIsSet_ = false; +} + std::string CompareJobInfo::getErrorMsg() const { return errorMsg_; @@ -384,6 +432,27 @@ void CompareJobInfo::unseterrorMsg() errorMsgIsSet_ = false; } +int64_t CompareJobInfo::getDynamicCompareDelay() const +{ + return dynamicCompareDelay_; +} + +void CompareJobInfo::setDynamicCompareDelay(int64_t value) +{ + dynamicCompareDelay_ = value; + dynamicCompareDelayIsSet_ = true; +} + +bool CompareJobInfo::dynamicCompareDelayIsSet() const +{ + return dynamicCompareDelayIsSet_; +} + +void CompareJobInfo::unsetdynamicCompareDelay() +{ + dynamicCompareDelayIsSet_ = false; +} + } } } diff --git a/gaussdb/include/huaweicloud/gaussdb/v3/model/TableConfigCheckRequestV3.h b/gaussdb/include/huaweicloud/gaussdb/v3/model/TableConfigCheckRequestV3.h index 1dc924bf7..8756a85c3 100644 --- a/gaussdb/include/huaweicloud/gaussdb/v3/model/TableConfigCheckRequestV3.h +++ b/gaussdb/include/huaweicloud/gaussdb/v3/model/TableConfigCheckRequestV3.h @@ -105,6 +105,24 @@ class HUAWEICLOUD_GAUSSDB_V3_EXPORT TableConfigCheckRequestV3 void unsettableReplConfig(); void setTableReplConfig(const TableReplConfig& value); + /// + /// 目标数据库名。字符长度限制3~128位，仅支持英文大小写字母、数字以及下划线。 + /// + + std::string getTargetDatabaseName() const; + bool targetDatabaseNameIsSet() const; + void unsettargetDatabaseName(); + void setTargetDatabaseName(const std::string& value); + + /// + /// 是否创建同步任务 + /// + + std::string getIsCreateTask() const; + bool isCreateTaskIsSet() const; + void unsetisCreateTask(); + void setIsCreateTask(const std::string& value); + protected: std::string sourceInstanceId_; @@ -121,6 +139,10 @@ class HUAWEICLOUD_GAUSSDB_V3_EXPORT TableConfigCheckRequestV3 bool tablesConfigsIsSet_; TableReplConfig tableReplConfig_; bool tableReplConfigIsSet_; + std::string targetDatabaseName_; + bool targetDatabaseNameIsSet_; + std::string isCreateTask_; + bool isCreateTaskIsSet_; }; diff --git a/gaussdb/src/v3/model/TableConfigCheckRequestV3.cpp b/gaussdb/src/v3/model/TableConfigCheckRequestV3.cpp index d0763a51b..9b9e1690d 100644 --- a/gaussdb/src/v3/model/TableConfigCheckRequestV3.cpp +++ b/gaussdb/src/v3/model/TableConfigCheckRequestV3.cpp @@ -23,6 +23,10 @@ TableConfigCheckRequestV3::TableConfigCheckRequestV3() dbConfigsIsSet_ = false; tablesConfigsIsSet_ = false; tableReplConfigIsSet_ = false; + targetDatabaseName_ = ""; + targetDatabaseNameIsSet_ = false; + isCreateTask_ = ""; + isCreateTaskIsSet_ = false; } TableConfigCheckRequestV3::~TableConfigCheckRequestV3() = default; @@ -56,6 +60,12 @@ web::json::value TableConfigCheckRequestV3::toJson() const if(tableReplConfigIsSet_) { val[utility::conversions::to_string_t("table_repl_config")] = ModelBase::toJson(tableReplConfig_); } + if(targetDatabaseNameIsSet_) { + val[utility::conversions::to_string_t("target_database_name")] = ModelBase::toJson(targetDatabaseName_); + } + if(isCreateTaskIsSet_) { + val[utility::conversions::to_string_t("is_create_task")] = ModelBase::toJson(isCreateTask_); + } return val; } @@ -126,6 +136,24 @@ bool TableConfigCheckRequestV3::fromJson(const web::json::value& val) setTableReplConfig(refVal); } } + if(val.has_field(utility::conversions::to_string_t("target_database_name"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("target_database_name")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setTargetDatabaseName(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("is_create_task"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("is_create_task")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setIsCreateTask(refVal); + } + } return ok; } @@ -277,6 +305,48 @@ void TableConfigCheckRequestV3::unsettableReplConfig() tableReplConfigIsSet_ = false; } +std::string TableConfigCheckRequestV3::getTargetDatabaseName() const +{ + return targetDatabaseName_; +} + +void TableConfigCheckRequestV3::setTargetDatabaseName(const std::string& value) +{ + targetDatabaseName_ = value; + targetDatabaseNameIsSet_ = true; +} + +bool TableConfigCheckRequestV3::targetDatabaseNameIsSet() const +{ + return targetDatabaseNameIsSet_; +} + +void TableConfigCheckRequestV3::unsettargetDatabaseName() +{ + targetDatabaseNameIsSet_ = false; +} + +std::string TableConfigCheckRequestV3::getIsCreateTask() const +{ + return isCreateTask_; +} + +void TableConfigCheckRequestV3::setIsCreateTask(const std::string& value) +{ + isCreateTask_ = value; + isCreateTaskIsSet_ = true; +} + +bool TableConfigCheckRequestV3::isCreateTaskIsSet() const +{ + return isCreateTaskIsSet_; +} + +void TableConfigCheckRequestV3::unsetisCreateTask() +{ + isCreateTaskIsSet_ = false; +} + } } } diff --git a/live/include/huaweicloud/live/v1/model/AudioSelectorLangSelection.h b/live/include/huaweicloud/live/v1/model/AudioSelectorLangSelection.h new file mode 100644 index 000000000..31e4eabe3 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/AudioSelectorLangSelection.h @@ -0,0 +1,75 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorLangSelection_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorLangSelection_H_ + + +#include + +#include +#include +#include + +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// 音频选择器语言设置 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT AudioSelectorLangSelection + : public ModelBase +{ +public: + AudioSelectorLangSelection(); + virtual ~AudioSelectorLangSelection(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// AudioSelectorLangSelection members + + /// + /// 语言简称，输入2或3个小写字母的语言代码。 + /// + + std::string getLanguageCode() const; + bool languageCodeIsSet() const; + void unsetlanguageCode(); + void setLanguageCode(const std::string& value); + + /// + /// 语言输出策略。 取值如下： - LOOSE：宽松匹配，示例“eng”会优先匹配源流中语言为English的音轨，如果匹配不到，则选择PID最小的音轨。 - STRICT：严格匹配，示例“eng”会严格匹配源流中语言为English的音轨，如果匹配不到，媒体直播服务会自动补齐一个静音分片，当终端使用此音频选择器播放视频时，会静音播放。 + /// + + std::string getLanguageSelectionPolicy() const; + bool languageSelectionPolicyIsSet() const; + void unsetlanguageSelectionPolicy(); + void setLanguageSelectionPolicy(const std::string& value); + + +protected: + std::string languageCode_; + bool languageCodeIsSet_; + std::string languageSelectionPolicy_; + bool languageSelectionPolicyIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorLangSelection_H_ diff --git a/live/include/huaweicloud/live/v1/model/AudioSelectorPidSelection.h b/live/include/huaweicloud/live/v1/model/AudioSelectorPidSelection.h new file mode 100644 index 000000000..53548cf98 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/AudioSelectorPidSelection.h @@ -0,0 +1,63 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorPidSelection_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorPidSelection_H_ + + +#include + +#include +#include +#include + + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// PID选择器 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT AudioSelectorPidSelection + : public ModelBase +{ +public: + AudioSelectorPidSelection(); + virtual ~AudioSelectorPidSelection(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// AudioSelectorPidSelection members + + /// + /// 设置PID的值 + /// + + int32_t getPid() const; + bool pidIsSet() const; + void unsetpid(); + void setPid(int32_t value); + + +protected: + int32_t pid_; + bool pidIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorPidSelection_H_ diff --git a/live/include/huaweicloud/live/v1/model/AudioSelectorSettings.h b/live/include/huaweicloud/live/v1/model/AudioSelectorSettings.h new file mode 100644 index 000000000..3500a63f9 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/AudioSelectorSettings.h @@ -0,0 +1,76 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorSettings_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorSettings_H_ + + +#include + +#include +#include +#include + +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// 设置音频选择器 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT AudioSelectorSettings + : public ModelBase +{ +public: + AudioSelectorSettings(); + virtual ~AudioSelectorSettings(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// AudioSelectorSettings members + + /// + /// + /// + + AudioSelectorLangSelection getAudioLanguageSelection() const; + bool audioLanguageSelectionIsSet() const; + void unsetaudioLanguageSelection(); + void setAudioLanguageSelection(const AudioSelectorLangSelection& value); + + /// + /// + /// + + AudioSelectorPidSelection getAudioPidSelection() const; + bool audioPidSelectionIsSet() const; + void unsetaudioPidSelection(); + void setAudioPidSelection(const AudioSelectorPidSelection& value); + + +protected: + AudioSelectorLangSelection audioLanguageSelection_; + bool audioLanguageSelectionIsSet_; + AudioSelectorPidSelection audioPidSelection_; + bool audioPidSelectionIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_AudioSelectorSettings_H_ diff --git a/live/include/huaweicloud/live/v1/model/CreateHarvestTaskInfoReq.h b/live/include/huaweicloud/live/v1/model/CreateHarvestTaskInfoReq.h index aea202216..943806603 100644 --- a/live/include/huaweicloud/live/v1/model/CreateHarvestTaskInfoReq.h +++ b/live/include/huaweicloud/live/v1/model/CreateHarvestTaskInfoReq.h @@ -58,7 +58,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT CreateHarvestTaskInfoReq void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/CreateHarvestTaskResponse.h b/live/include/huaweicloud/live/v1/model/CreateHarvestTaskResponse.h index 3522f5f48..f3bf5f941 100644 --- a/live/include/huaweicloud/live/v1/model/CreateHarvestTaskResponse.h +++ b/live/include/huaweicloud/live/v1/model/CreateHarvestTaskResponse.h @@ -67,7 +67,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT CreateHarvestTaskResponse void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq.h b/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq.h index 77181a497..19842eda2 100644 --- a/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq.h +++ b/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq.h @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -62,7 +63,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT CreateOttChannelInfoReq void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; @@ -124,6 +125,15 @@ class HUAWEICLOUD_LIVE_V1_EXPORT CreateOttChannelInfoReq void unsetendpoints(); void setEndpoints(const std::vector& value); + /// + /// + /// + + EncoderSettingsExpand getEncoderSettingsExpand() const; + bool encoderSettingsExpandIsSet() const; + void unsetencoderSettingsExpand(); + void setEncoderSettingsExpand(const EncoderSettingsExpand& value); + protected: std::string domain_; @@ -144,6 +154,8 @@ class HUAWEICLOUD_LIVE_V1_EXPORT CreateOttChannelInfoReq bool recordSettingsIsSet_; std::vector endpoints_; bool endpointsIsSet_; + EncoderSettingsExpand encoderSettingsExpand_; + bool encoderSettingsExpandIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq_record_settings.h b/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq_record_settings.h index 57c33588f..ddcd2ec0b 100644 --- a/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq_record_settings.h +++ b/live/include/huaweicloud/live/v1/model/CreateOttChannelInfoReq_record_settings.h @@ -19,7 +19,7 @@ namespace Model { using namespace HuaweiCloud::Sdk::Core::Utils; using namespace HuaweiCloud::Sdk::Core::Http; /// -/// 最大回看录制时长。在此时间段内会连续不断的录制，为必选项 单位：秒。取值为“0”时，表示不支持录制；最大支持录制14天 +/// 回看录制的配置信息。 /// class HUAWEICLOUD_LIVE_V1_EXPORT CreateOttChannelInfoReq_record_settings : public ModelBase diff --git a/live/include/huaweicloud/live/v1/model/DashPackageItem.h b/live/include/huaweicloud/live/v1/model/DashPackageItem.h index 7e05cbab6..228a91c70 100644 --- a/live/include/huaweicloud/live/v1/model/DashPackageItem.h +++ b/live/include/huaweicloud/live/v1/model/DashPackageItem.h @@ -44,7 +44,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DashPackageItem /// DashPackageItem members /// - /// 客户自定义的拉流地址，包括方法、域名、路径和参数 + /// 客户自定义的拉流地址，包括方法、域名、路径 /// std::string getUrl() const; @@ -62,7 +62,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DashPackageItem void setStreamSelection(const std::vector& value); /// - /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 + /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 > 修改分片时长会影响已录制内容的时移和回看服务，请谨慎修改！ /// int32_t getSegmentDurationSeconds() const; @@ -115,6 +115,15 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DashPackageItem void unsetrequestArgs(); void setRequestArgs(const PackageRequestArgs& value); + /// + /// 广告标识。 DASH取值：\"xml+bin\"。 + /// + + std::string getAdMarker() const; + bool adMarkerIsSet() const; + void unsetadMarker(); + void setAdMarker(const std::string& value); + protected: std::string url_; @@ -133,6 +142,8 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DashPackageItem bool extArgsIsSet_; PackageRequestArgs requestArgs_; bool requestArgsIsSet_; + std::string adMarker_; + bool adMarkerIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/DeleteOttChannelInfoResponse.h b/live/include/huaweicloud/live/v1/model/DeleteOttChannelInfoResponse.h index bd38dd1d3..05883ee97 100644 --- a/live/include/huaweicloud/live/v1/model/DeleteOttChannelInfoResponse.h +++ b/live/include/huaweicloud/live/v1/model/DeleteOttChannelInfoResponse.h @@ -10,8 +10,6 @@ #include #include -#include -#include namespace HuaweiCloud { namespace Sdk { @@ -85,15 +83,6 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DeleteOttChannelInfoResponse void unsetid(); void setId(const std::string& value); - /// - /// 推流URL列表。创建频道时，只有入流协议为RTMP_PUSH时，会返回推流URL列表 - /// - - std::vector& getSources(); - bool sourcesIsSet() const; - void unsetsources(); - void setSources(const std::vector& value); - protected: std::string resultCode_; @@ -106,8 +95,6 @@ class HUAWEICLOUD_LIVE_V1_EXPORT DeleteOttChannelInfoResponse bool appNameIsSet_; std::string id_; bool idIsSet_; - std::vector sources_; - bool sourcesIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand.h b/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand.h new file mode 100644 index 000000000..314926795 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand.h @@ -0,0 +1,65 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_H_ + + +#include + +#include +#include +#include + +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// 输出编码扩展 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT EncoderSettingsExpand + : public ModelBase +{ +public: + EncoderSettingsExpand(); + virtual ~EncoderSettingsExpand(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// EncoderSettingsExpand members + + /// + /// 音频输出配置的描述信息 + /// + + std::vector& getAudioDescriptions(); + bool audioDescriptionsIsSet() const; + void unsetaudioDescriptions(); + void setAudioDescriptions(const std::vector& value); + + +protected: + std::vector audioDescriptions_; + bool audioDescriptionsIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_H_ diff --git a/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand_audio_descriptions.h b/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand_audio_descriptions.h new file mode 100644 index 000000000..ba55cb308 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/EncoderSettingsExpand_audio_descriptions.h @@ -0,0 +1,108 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_audio_descriptions_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_audio_descriptions_H_ + + +#include + +#include +#include +#include + +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// +/// +class HUAWEICLOUD_LIVE_V1_EXPORT EncoderSettingsExpand_audio_descriptions + : public ModelBase +{ +public: + EncoderSettingsExpand_audio_descriptions(); + virtual ~EncoderSettingsExpand_audio_descriptions(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// EncoderSettingsExpand_audio_descriptions members + + /// + /// 音频输出配置的名称。仅支持大小写字母，数字，中划线（-），下划线（_）。 同一个频道不同的音频输出配置名称，不允许重复。 + /// + + std::string getName() const; + bool nameIsSet() const; + void unsetname(); + void setName(const std::string& value); + + /// + /// 音频选择器名称 + /// + + std::string getAudioSelectorName() const; + bool audioSelectorNameIsSet() const; + void unsetaudioSelectorName(); + void setAudioSelectorName(const std::string& value); + + /// + /// 语言代码控制。这里的设置不会修改音频实际的语言，只会修改音频对外展示的语言。 包含如下选项： - FOLLOW_INPUT：如果所选音频选择器对应的输出音频有语言，则与其保持一致，否则会以这里配置的语言代码和流名称进行兜底。推荐当前选项，为默认值。 - USE_CONFIGURED：用户根据实际情况自定义输出音频的语言和流名称。 + /// + + std::string getLanguageCodeControl() const; + bool languageCodeControlIsSet() const; + void unsetlanguageCodeControl(); + void setLanguageCodeControl(const std::string& value); + + /// + /// 语言代码，输入2或3个小写字母。 + /// + + std::string getLanguageCode() const; + bool languageCodeIsSet() const; + void unsetlanguageCode(); + void setLanguageCode(const std::string& value); + + /// + /// 流名称 + /// + + std::string getStreamName() const; + bool streamNameIsSet() const; + void unsetstreamName(); + void setStreamName(const std::string& value); + + +protected: + std::string name_; + bool nameIsSet_; + std::string audioSelectorName_; + bool audioSelectorNameIsSet_; + std::string languageCodeControl_; + bool languageCodeControlIsSet_; + std::string languageCode_; + bool languageCodeIsSet_; + std::string streamName_; + bool streamNameIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_EncoderSettingsExpand_audio_descriptions_H_ diff --git a/live/include/huaweicloud/live/v1/model/Encryption.h b/live/include/huaweicloud/live/v1/model/Encryption.h index ccec5bbcb..1639e9938 100644 --- a/live/include/huaweicloud/live/v1/model/Encryption.h +++ b/live/include/huaweicloud/live/v1/model/Encryption.h @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -40,7 +41,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT Encryption /// Encryption members /// - /// 密钥缓存时间。如果密钥不变，默认缓存七天 + /// 密钥缓存时间。如果密钥不变，默认缓存七天。 请注意：目前为保留字段，不支持配置。 /// int32_t getKeyRotationIntervalSeconds() const; @@ -49,7 +50,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT Encryption void setKeyRotationIntervalSeconds(int32_t value); /// - /// 加密方式 + /// 加密方式。 请注意：目前为保留字段，不支持配置。 /// std::string getEncryptionMethod() const; @@ -70,13 +71,13 @@ class HUAWEICLOUD_LIVE_V1_EXPORT Encryption /// 客户生成的DRM内容ID /// - std::string getDrmContentId() const; - bool drmContentIdIsSet() const; - void unsetdrmContentId(); - void setDrmContentId(const std::string& value); + std::string getResourceId() const; + bool resourceIdIsSet() const; + void unsetresourceId(); + void setResourceId(const std::string& value); /// - /// system_id枚举值 + /// system_id枚举值。 取值如下： * HLS：FairPlay * DASH：Widevine、PlayReady * MSS：PlayReady /// std::vector& getSystemIds(); @@ -85,22 +86,49 @@ class HUAWEICLOUD_LIVE_V1_EXPORT Encryption void setSystemIds(const std::vector& value); /// - /// 增加到请求消息体header中的鉴权信息 + /// 获取密钥的DRM地址 /// - std::string getAuthInfo() const; - bool authInfoIsSet() const; - void unsetauthInfo(); - void setAuthInfo(const std::string& value); + std::string getUrl() const; + bool urlIsSet() const; + void unseturl(); + void setUrl(const std::string& value); /// - /// 获取密钥的DRM地址 + /// drm speke 版本号 当前只支持1.0 + /// + + std::string getSpekeVersion() const; + bool spekeVersionIsSet() const; + void unsetspekeVersion(); + void setSpekeVersion(const std::string& value); + + /// + /// 请求模式。 取值如下： * direct_http：HTTP(S)直接访问DRM。 * functiongraph_proxy：FunctionGraph代理访问DRM。 + /// + + std::string getRequestMode() const; + bool requestModeIsSet() const; + void unsetrequestMode(); + void setRequestMode(const std::string& value); + + /// + /// 需要添加在drm请求头中的鉴权信息。最多支持配置5个。 仅direct_http请求模式支持配置http_headers。 + /// + + std::vector& getHttpHeaders(); + bool httpHeadersIsSet() const; + void unsethttpHeaders(); + void setHttpHeaders(const std::vector& value); + + /// + /// functiongraph_proxy请求模式需要提供functiongraph的urn。 /// - std::string getKmUrl() const; - bool kmUrlIsSet() const; - void unsetkmUrl(); - void setKmUrl(const std::string& value); + std::string getUrn() const; + bool urnIsSet() const; + void unseturn(); + void setUrn(const std::string& value); protected: @@ -110,14 +138,20 @@ class HUAWEICLOUD_LIVE_V1_EXPORT Encryption bool encryptionMethodIsSet_; std::string level_; bool levelIsSet_; - std::string drmContentId_; - bool drmContentIdIsSet_; + std::string resourceId_; + bool resourceIdIsSet_; std::vector systemIds_; bool systemIdsIsSet_; - std::string authInfo_; - bool authInfoIsSet_; - std::string kmUrl_; - bool kmUrlIsSet_; + std::string url_; + bool urlIsSet_; + std::string spekeVersion_; + bool spekeVersionIsSet_; + std::string requestMode_; + bool requestModeIsSet_; + std::vector httpHeaders_; + bool httpHeadersIsSet_; + std::string urn_; + bool urnIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/FailoverConditions.h b/live/include/huaweicloud/live/v1/model/FailoverConditions.h index d768d8b9d..b3bff67c2 100644 --- a/live/include/huaweicloud/live/v1/model/FailoverConditions.h +++ b/live/include/huaweicloud/live/v1/model/FailoverConditions.h @@ -39,7 +39,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT FailoverConditions /// FailoverConditions members /// - /// 入流停止的时长阈值。到达此阈值后，自动触发主备切换 单位：毫秒，取值范围：0 - 3600000 + /// 入流停止的时长阈值。到达此阈值后，自动触发主备切换。 单位：毫秒，取值范围：0 - 3600000。 非必填，默认填2000ms。 /// int32_t getInputLossThresholdMsec() const; @@ -48,7 +48,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT FailoverConditions void setInputLossThresholdMsec(int32_t value); /// - /// 以主入流URL为第一优先级（PRIMARY）或主备URL平等切换（EQUAL） 如果为平等切换时使用的是备URL，无需手工切换到主URL + /// 以主入流URL为第一优先级（PRIMARY）或主备URL平等切换（EQUAL）。 如果是平等切换时，使用的是备URL，不会自动切换至主URL。 非必填，默认值为EQUAL。 /// std::string getInputPreference() const; diff --git a/live/include/huaweicloud/live/v1/model/HarvestTaskCreateSucRsp.h b/live/include/huaweicloud/live/v1/model/HarvestTaskCreateSucRsp.h index 62fcab5cc..cc8546e27 100644 --- a/live/include/huaweicloud/live/v1/model/HarvestTaskCreateSucRsp.h +++ b/live/include/huaweicloud/live/v1/model/HarvestTaskCreateSucRsp.h @@ -67,7 +67,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT HarvestTaskCreateSucRsp void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/HlsPackageItem.h b/live/include/huaweicloud/live/v1/model/HlsPackageItem.h index 0a4455b45..d74a0d962 100644 --- a/live/include/huaweicloud/live/v1/model/HlsPackageItem.h +++ b/live/include/huaweicloud/live/v1/model/HlsPackageItem.h @@ -44,7 +44,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT HlsPackageItem /// HlsPackageItem members /// - /// 客户自定义的拉流地址，包括方法、域名、路径和参数 + /// 客户自定义的拉流地址，包括方法、域名、路径 /// std::string getUrl() const; @@ -71,7 +71,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT HlsPackageItem void setHlsVersion(const std::string& value); /// - /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 + /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 > 修改分片时长会影响已录制内容的时移和回看服务，请谨慎修改！ /// int32_t getSegmentDurationSeconds() const; @@ -124,6 +124,15 @@ class HUAWEICLOUD_LIVE_V1_EXPORT HlsPackageItem void unsetrequestArgs(); void setRequestArgs(const PackageRequestArgs& value); + /// + /// 广告标识。 HLS取值：[\"ENHANCED_SCTE35\"]。 + /// + + std::vector& getAdMarker(); + bool adMarkerIsSet() const; + void unsetadMarker(); + void setAdMarker(const std::vector& value); + protected: std::string url_; @@ -144,6 +153,8 @@ class HUAWEICLOUD_LIVE_V1_EXPORT HlsPackageItem bool extArgsIsSet_; PackageRequestArgs requestArgs_; bool requestArgsIsSet_; + std::vector adMarker_; + bool adMarkerIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/HttpHeader.h b/live/include/huaweicloud/live/v1/model/HttpHeader.h new file mode 100644 index 000000000..24f8362ab --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/HttpHeader.h @@ -0,0 +1,75 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_HttpHeader_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_HttpHeader_H_ + + +#include + +#include +#include +#include + +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// drm加密信息,添加在请求头中的鉴权信息 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT HttpHeader + : public ModelBase +{ +public: + HttpHeader(); + virtual ~HttpHeader(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// HttpHeader members + + /// + /// 请求头中key字段名 + /// + + std::string getKey() const; + bool keyIsSet() const; + void unsetkey(); + void setKey(const std::string& value); + + /// + /// 请求头中key对应的value值 + /// + + std::string getValue() const; + bool valueIsSet() const; + void unsetvalue(); + void setValue(const std::string& value); + + +protected: + std::string key_; + bool keyIsSet_; + std::string value_; + bool valueIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_HttpHeader_H_ diff --git a/live/include/huaweicloud/live/v1/model/InputAudioSelector.h b/live/include/huaweicloud/live/v1/model/InputAudioSelector.h new file mode 100644 index 000000000..ff1b80489 --- /dev/null +++ b/live/include/huaweicloud/live/v1/model/InputAudioSelector.h @@ -0,0 +1,76 @@ + +#ifndef HUAWEICLOUD_SDK_LIVE_V1_MODEL_InputAudioSelector_H_ +#define HUAWEICLOUD_SDK_LIVE_V1_MODEL_InputAudioSelector_H_ + + +#include + +#include +#include +#include + +#include +#include + +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + +using namespace HuaweiCloud::Sdk::Core::Utils; +using namespace HuaweiCloud::Sdk::Core::Http; +/// +/// 音频选择器 +/// +class HUAWEICLOUD_LIVE_V1_EXPORT InputAudioSelector + : public ModelBase +{ +public: + InputAudioSelector(); + virtual ~InputAudioSelector(); + + ///////////////////////////////////////////// + /// ModelBase overrides + + void validate() override; + web::json::value toJson() const override; + bool fromJson(const web::json::value& json) override; + ///////////////////////////////////////////// + /// InputAudioSelector members + + /// + /// 音频选择器的名称。仅支持大小写字母、数字、中划线和下划线。 同一个频道中每个选择器的名称需要唯一。 + /// + + std::string getName() const; + bool nameIsSet() const; + void unsetname(); + void setName(const std::string& value); + + /// + /// + /// + + AudioSelectorSettings getSelectorSettings() const; + bool selectorSettingsIsSet() const; + void unsetselectorSettings(); + void setSelectorSettings(const AudioSelectorSettings& value); + + +protected: + std::string name_; + bool nameIsSet_; + AudioSelectorSettings selectorSettings_; + bool selectorSettingsIsSet_; + +}; + + +} +} +} +} +} + +#endif // HUAWEICLOUD_SDK_LIVE_V1_MODEL_InputAudioSelector_H_ diff --git a/live/include/huaweicloud/live/v1/model/InputStreamInfo.h b/live/include/huaweicloud/live/v1/model/InputStreamInfo.h index eb2363b75..546e2eeb3 100644 --- a/live/include/huaweicloud/live/v1/model/InputStreamInfo.h +++ b/live/include/huaweicloud/live/v1/model/InputStreamInfo.h @@ -9,6 +9,7 @@ #include #include +#include #include #include #include @@ -43,7 +44,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT InputStreamInfo /// InputStreamInfo members /// - /// 频道入流协议 - FLV_PULL - RTMP_PUSH - RTMP_PULL - HLS_PULL - SRT_PULL - SRT_PUSH + /// 频道入流协议 - FLV_PULL - RTMP_PUSH - HLS_PULL - SRT_PULL - SRT_PUSH /// std::string getInputProtocol() const; @@ -79,7 +80,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT InputStreamInfo void setFailoverConditions(const FailoverConditions& value); /// - /// 当入流协议为HLS_PULL时，最大带宽限制。 未配置会默认选择BANDWIDTH最高的流 + /// 当入流协议为HLS_PULL时，需要配置的最大带宽。 用户提供的拉流URL中，针对不同码率的音视频，均会携带带宽参数“BANDWIDTH”。 - 如果这里配置最大带宽，媒体直播服务从URL拉流时，会选择小于最大带宽且码率最大的音视频流，推流到源站。 - 如果这里未配置最大带宽，媒体直播服务从URL拉流时，会默认选择“BANDWIDTH”最高的音视频流，推流到源站。 /// int32_t getMaxBandwidthLimit() const; @@ -96,6 +97,42 @@ class HUAWEICLOUD_LIVE_V1_EXPORT InputStreamInfo void unsetipPortMode(); void setIpPortMode(bool value); + /// + /// SRT_PUSH类型时，客户push ip白名单 + /// + + std::string getIpWhitelist() const; + bool ipWhitelistIsSet() const; + void unsetipWhitelist(); + void setIpWhitelist(const std::string& value); + + /// + /// 广告的scte35信号源。 仅HLS_PULL类型的频道支持此配置，且目前仅支持SEGMENTS。 + /// + + std::string getScte35Source() const; + bool scte35SourceIsSet() const; + void unsetscte35Source(); + void setScte35Source(const std::string& value); + + /// + /// 广告触发器配置。 包含如下取值： - Splice insert：拼接插入 - Provider advertisement：提供商广告 - Distributor advertisement：分销商广告 - Provider placement opportunity：提供商置放机会 - Distributor placement opportunity：分销商置放机会 + /// + + std::vector& getAdTriggers(); + bool adTriggersIsSet() const; + void unsetadTriggers(); + void setAdTriggers(const std::vector& value); + + /// + /// 设置音频选择器，最多设置8个音频选择器 + /// + + std::vector& getAudioSelectors(); + bool audioSelectorsIsSet() const; + void unsetaudioSelectors(); + void setAudioSelectors(const std::vector& value); + protected: std::string inputProtocol_; @@ -110,6 +147,14 @@ class HUAWEICLOUD_LIVE_V1_EXPORT InputStreamInfo bool maxBandwidthLimitIsSet_; bool ipPortMode_; bool ipPortModeIsSet_; + std::string ipWhitelist_; + bool ipWhitelistIsSet_; + std::string scte35Source_; + bool scte35SourceIsSet_; + std::vector adTriggers_; + bool adTriggersIsSet_; + std::vector audioSelectors_; + bool audioSelectorsIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskRequestBody.h b/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskRequestBody.h index b95537412..bbd524894 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskRequestBody.h +++ b/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskRequestBody.h @@ -58,7 +58,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyHarvestTaskRequestBody void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskResponse.h b/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskResponse.h index a08b85e84..973359f9a 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskResponse.h +++ b/live/include/huaweicloud/live/v1/model/ModifyHarvestTaskResponse.h @@ -67,7 +67,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyHarvestTaskResponse void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/ModifyOttChannelEncoderSettings.h b/live/include/huaweicloud/live/v1/model/ModifyOttChannelEncoderSettings.h index 578ecb878..2f0543f56 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyOttChannelEncoderSettings.h +++ b/live/include/huaweicloud/live/v1/model/ModifyOttChannelEncoderSettings.h @@ -11,6 +11,7 @@ #include #include +#include #include namespace HuaweiCloud { @@ -76,6 +77,15 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelEncoderSettings void unsetencoderSettings(); void setEncoderSettings(const std::vector& value); + /// + /// + /// + + EncoderSettingsExpand getEncoderSettingsExpand() const; + bool encoderSettingsExpandIsSet() const; + void unsetencoderSettingsExpand(); + void setEncoderSettingsExpand(const EncoderSettingsExpand& value); + protected: std::string domain_; @@ -86,6 +96,8 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelEncoderSettings bool idIsSet_; std::vector encoderSettings_; bool encoderSettingsIsSet_; + EncoderSettingsExpand encoderSettingsExpand_; + bool encoderSettingsExpandIsSet_; }; diff --git a/live/include/huaweicloud/live/v1/model/ModifyOttChannelInfoRecordSettingsResponse.h b/live/include/huaweicloud/live/v1/model/ModifyOttChannelInfoRecordSettingsResponse.h index 9bdb9efc4..6bcffe236 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyOttChannelInfoRecordSettingsResponse.h +++ b/live/include/huaweicloud/live/v1/model/ModifyOttChannelInfoRecordSettingsResponse.h @@ -10,8 +10,6 @@ #include #include -#include -#include namespace HuaweiCloud { namespace Sdk { @@ -85,15 +83,6 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelInfoRecordSettingsResponse void unsetid(); void setId(const std::string& value); - /// - /// 推流URL列表。创建频道时，只有入流协议为RTMP_PUSH时，会返回推流URL列表 - /// - - std::vector& getSources(); - bool sourcesIsSet() const; - void unsetsources(); - void setSources(const std::vector& value); - protected: std::string resultCode_; @@ -106,8 +95,6 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelInfoRecordSettingsResponse bool appNameIsSet_; std::string id_; bool idIsSet_; - std::vector sources_; - bool sourcesIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/live/include/huaweicloud/live/v1/model/ModifyOttChannelRecordSettings_record_settings.h b/live/include/huaweicloud/live/v1/model/ModifyOttChannelRecordSettings_record_settings.h index 111bf4700..179d4f196 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyOttChannelRecordSettings_record_settings.h +++ b/live/include/huaweicloud/live/v1/model/ModifyOttChannelRecordSettings_record_settings.h @@ -19,7 +19,7 @@ namespace Model { using namespace HuaweiCloud::Sdk::Core::Utils; using namespace HuaweiCloud::Sdk::Core::Http; /// -/// 最大回看录制时长。在此时间段内会连续不断的录制，为必选项 单位：秒。取值为“0”时，表示不支持录制；最大支持录制14天 +/// 回看录制的配置信息。 /// class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelRecordSettings_record_settings : public ModelBase diff --git a/live/include/huaweicloud/live/v1/model/ModifyOttChannelState.h b/live/include/huaweicloud/live/v1/model/ModifyOttChannelState.h index 0afb7a447..28da2eb34 100644 --- a/live/include/huaweicloud/live/v1/model/ModifyOttChannelState.h +++ b/live/include/huaweicloud/live/v1/model/ModifyOttChannelState.h @@ -57,7 +57,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT ModifyOttChannelState void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/include/huaweicloud/live/v1/model/MssPackageItem.h b/live/include/huaweicloud/live/v1/model/MssPackageItem.h index b85469783..5c32afff0 100644 --- a/live/include/huaweicloud/live/v1/model/MssPackageItem.h +++ b/live/include/huaweicloud/live/v1/model/MssPackageItem.h @@ -44,7 +44,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT MssPackageItem /// MssPackageItem members /// - /// 客户自定义的拉流地址，包括方法、域名、路径和参数 + /// 客户自定义的拉流地址，包括方法、域名、路径 /// std::string getUrl() const; @@ -62,7 +62,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT MssPackageItem void setStreamSelection(const std::vector& value); /// - /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 + /// 频道输出分片的时长，为必选项 单位：秒。取值范围：1-10 > 修改分片时长会影响已录制内容的时移和回看服务，请谨慎修改！ /// int32_t getSegmentDurationSeconds() const; diff --git a/live/include/huaweicloud/live/v1/model/SecondarySourcesInfo.h b/live/include/huaweicloud/live/v1/model/SecondarySourcesInfo.h index 901cc8ed6..4f481a4e4 100644 --- a/live/include/huaweicloud/live/v1/model/SecondarySourcesInfo.h +++ b/live/include/huaweicloud/live/v1/model/SecondarySourcesInfo.h @@ -49,7 +49,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SecondarySourcesInfo void setUrl(const std::string& value); /// - /// 码率。无需直播转码时，此参数为必填项 单位：bps。取值范围：0 - 104,857,600（100Mbps） + /// 码率。无需直播转码时，此参数为必填项 单位：bps。取值范围：(0,104,857,600]（100Mbps） /// int32_t getBitrate() const; @@ -103,7 +103,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SecondarySourcesInfo void setBackupUrls(const std::vector& value); /// - /// 协议为SRT_PULL时，拉流地址的streamid + /// 频道为SRT_PULL类型时，拉流地址的Stream ID。 /// std::string getStreamId() const; @@ -112,7 +112,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SecondarySourcesInfo void setStreamId(const std::string& value); /// - /// 协议为SRT_PULL时，拉流时延 + /// 频道为SRT_PULL类型时的拉流时延。 /// int32_t getLatency() const; diff --git a/live/include/huaweicloud/live/v1/model/SourceRsp.h b/live/include/huaweicloud/live/v1/model/SourceRsp.h index 54f45c01a..3dd468b7a 100644 --- a/live/include/huaweicloud/live/v1/model/SourceRsp.h +++ b/live/include/huaweicloud/live/v1/model/SourceRsp.h @@ -48,7 +48,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SourceRsp void setUrl(const std::string& value); /// - /// 码率。 单位：bps。取值范围：0 - 104,857,600（100Mbps） + /// 码率。 单位：bps。取值范围：(0,104,857,600]（100Mbps） /// int32_t getBitrate() const; diff --git a/live/include/huaweicloud/live/v1/model/SourcesInfo.h b/live/include/huaweicloud/live/v1/model/SourcesInfo.h index 656786a08..54fbef5e9 100644 --- a/live/include/huaweicloud/live/v1/model/SourcesInfo.h +++ b/live/include/huaweicloud/live/v1/model/SourcesInfo.h @@ -49,7 +49,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SourcesInfo void setUrl(const std::string& value); /// - /// 码率。无需直播转码时，此参数为必填项 单位：bps。取值范围：0 - 104,857,600（100Mbps） + /// 码率。无需直播转码时，此参数为必填项 单位：bps。取值范围：(0,104,857,600]（100Mbps） /// int32_t getBitrate() const; @@ -112,7 +112,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SourcesInfo void setBackupUrls(const std::vector& value); /// - /// 协议为SRT_PULL时，拉流地址的streamid + /// 频道为SRT_PULL类型时，拉流地址的Stream ID。 /// std::string getStreamId() const; @@ -121,7 +121,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT SourcesInfo void setStreamId(const std::string& value); /// - /// 协议为SRT_PULL时，拉流时延 + /// 频道为SRT_PULL类型时的拉流时延。 /// int32_t getLatency() const; diff --git a/live/include/huaweicloud/live/v1/model/StreamSelectionItem.h b/live/include/huaweicloud/live/v1/model/StreamSelectionItem.h index 3cde4715d..df2a1c85a 100644 --- a/live/include/huaweicloud/live/v1/model/StreamSelectionItem.h +++ b/live/include/huaweicloud/live/v1/model/StreamSelectionItem.h @@ -48,7 +48,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT StreamSelectionItem void setKey(const std::string& value); /// - /// 最小码率，单位：bps 取值范围：0 - 104,857,600（100Mbps） + /// 最大码率，单位：bps 取值范围：0 - 104,857,600（100Mbps） /// int32_t getMaxBandwidth() const; @@ -57,7 +57,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT StreamSelectionItem void setMaxBandwidth(int32_t value); /// - /// 最小码率，单位：bps 取值范围：0 - 104,857,600（100Mbps） + /// 最小码率，单位：bps 取值范围：0 - 104,857,600（100Mbps） /// int32_t getMinBandwidth() const; diff --git a/live/include/huaweicloud/live/v1/model/UpdateHarvestJobStatusResponse.h b/live/include/huaweicloud/live/v1/model/UpdateHarvestJobStatusResponse.h index 51b2b4498..719004189 100644 --- a/live/include/huaweicloud/live/v1/model/UpdateHarvestJobStatusResponse.h +++ b/live/include/huaweicloud/live/v1/model/UpdateHarvestJobStatusResponse.h @@ -67,7 +67,7 @@ class HUAWEICLOUD_LIVE_V1_EXPORT UpdateHarvestJobStatusResponse void setAppName(const std::string& value); /// - /// 频道ID。频道唯一标识，为必填项。频道ID不建议输入下划线“_”，否则会影响转码和截图任务 + /// 频道ID。频道唯一标识，为必填项。 /// std::string getId() const; diff --git a/live/src/v1/model/AudioSelectorLangSelection.cpp b/live/src/v1/model/AudioSelectorLangSelection.cpp new file mode 100644 index 000000000..18b8e165d --- /dev/null +++ b/live/src/v1/model/AudioSelectorLangSelection.cpp @@ -0,0 +1,114 @@ + + +#include "huaweicloud/live/v1/model/AudioSelectorLangSelection.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +AudioSelectorLangSelection::AudioSelectorLangSelection() +{ + languageCode_ = ""; + languageCodeIsSet_ = false; + languageSelectionPolicy_ = ""; + languageSelectionPolicyIsSet_ = false; +} + +AudioSelectorLangSelection::~AudioSelectorLangSelection() = default; + +void AudioSelectorLangSelection::validate() +{ +} + +web::json::value AudioSelectorLangSelection::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(languageCodeIsSet_) { + val[utility::conversions::to_string_t("language_code")] = ModelBase::toJson(languageCode_); + } + if(languageSelectionPolicyIsSet_) { + val[utility::conversions::to_string_t("language_selection_policy")] = ModelBase::toJson(languageSelectionPolicy_); + } + + return val; +} +bool AudioSelectorLangSelection::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("language_code"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("language_code")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setLanguageCode(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("language_selection_policy"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("language_selection_policy")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setLanguageSelectionPolicy(refVal); + } + } + return ok; +} + + +std::string AudioSelectorLangSelection::getLanguageCode() const +{ + return languageCode_; +} + +void AudioSelectorLangSelection::setLanguageCode(const std::string& value) +{ + languageCode_ = value; + languageCodeIsSet_ = true; +} + +bool AudioSelectorLangSelection::languageCodeIsSet() const +{ + return languageCodeIsSet_; +} + +void AudioSelectorLangSelection::unsetlanguageCode() +{ + languageCodeIsSet_ = false; +} + +std::string AudioSelectorLangSelection::getLanguageSelectionPolicy() const +{ + return languageSelectionPolicy_; +} + +void AudioSelectorLangSelection::setLanguageSelectionPolicy(const std::string& value) +{ + languageSelectionPolicy_ = value; + languageSelectionPolicyIsSet_ = true; +} + +bool AudioSelectorLangSelection::languageSelectionPolicyIsSet() const +{ + return languageSelectionPolicyIsSet_; +} + +void AudioSelectorLangSelection::unsetlanguageSelectionPolicy() +{ + languageSelectionPolicyIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/AudioSelectorPidSelection.cpp b/live/src/v1/model/AudioSelectorPidSelection.cpp new file mode 100644 index 000000000..7bca298ec --- /dev/null +++ b/live/src/v1/model/AudioSelectorPidSelection.cpp @@ -0,0 +1,79 @@ + + +#include "huaweicloud/live/v1/model/AudioSelectorPidSelection.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +AudioSelectorPidSelection::AudioSelectorPidSelection() +{ + pid_ = 0; + pidIsSet_ = false; +} + +AudioSelectorPidSelection::~AudioSelectorPidSelection() = default; + +void AudioSelectorPidSelection::validate() +{ +} + +web::json::value AudioSelectorPidSelection::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(pidIsSet_) { + val[utility::conversions::to_string_t("pid")] = ModelBase::toJson(pid_); + } + + return val; +} +bool AudioSelectorPidSelection::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("pid"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("pid")); + if(!fieldValue.is_null()) + { + int32_t refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setPid(refVal); + } + } + return ok; +} + + +int32_t AudioSelectorPidSelection::getPid() const +{ + return pid_; +} + +void AudioSelectorPidSelection::setPid(int32_t value) +{ + pid_ = value; + pidIsSet_ = true; +} + +bool AudioSelectorPidSelection::pidIsSet() const +{ + return pidIsSet_; +} + +void AudioSelectorPidSelection::unsetpid() +{ + pidIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/AudioSelectorSettings.cpp b/live/src/v1/model/AudioSelectorSettings.cpp new file mode 100644 index 000000000..f150678af --- /dev/null +++ b/live/src/v1/model/AudioSelectorSettings.cpp @@ -0,0 +1,112 @@ + + +#include "huaweicloud/live/v1/model/AudioSelectorSettings.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +AudioSelectorSettings::AudioSelectorSettings() +{ + audioLanguageSelectionIsSet_ = false; + audioPidSelectionIsSet_ = false; +} + +AudioSelectorSettings::~AudioSelectorSettings() = default; + +void AudioSelectorSettings::validate() +{ +} + +web::json::value AudioSelectorSettings::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(audioLanguageSelectionIsSet_) { + val[utility::conversions::to_string_t("audio_language_selection")] = ModelBase::toJson(audioLanguageSelection_); + } + if(audioPidSelectionIsSet_) { + val[utility::conversions::to_string_t("audio_pid_selection")] = ModelBase::toJson(audioPidSelection_); + } + + return val; +} +bool AudioSelectorSettings::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("audio_language_selection"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("audio_language_selection")); + if(!fieldValue.is_null()) + { + AudioSelectorLangSelection refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAudioLanguageSelection(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("audio_pid_selection"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("audio_pid_selection")); + if(!fieldValue.is_null()) + { + AudioSelectorPidSelection refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAudioPidSelection(refVal); + } + } + return ok; +} + + +AudioSelectorLangSelection AudioSelectorSettings::getAudioLanguageSelection() const +{ + return audioLanguageSelection_; +} + +void AudioSelectorSettings::setAudioLanguageSelection(const AudioSelectorLangSelection& value) +{ + audioLanguageSelection_ = value; + audioLanguageSelectionIsSet_ = true; +} + +bool AudioSelectorSettings::audioLanguageSelectionIsSet() const +{ + return audioLanguageSelectionIsSet_; +} + +void AudioSelectorSettings::unsetaudioLanguageSelection() +{ + audioLanguageSelectionIsSet_ = false; +} + +AudioSelectorPidSelection AudioSelectorSettings::getAudioPidSelection() const +{ + return audioPidSelection_; +} + +void AudioSelectorSettings::setAudioPidSelection(const AudioSelectorPidSelection& value) +{ + audioPidSelection_ = value; + audioPidSelectionIsSet_ = true; +} + +bool AudioSelectorSettings::audioPidSelectionIsSet() const +{ + return audioPidSelectionIsSet_; +} + +void AudioSelectorSettings::unsetaudioPidSelection() +{ + audioPidSelectionIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/CreateOttChannelInfoReq.cpp b/live/src/v1/model/CreateOttChannelInfoReq.cpp index cf6b58a66..57a08e160 100644 --- a/live/src/v1/model/CreateOttChannelInfoReq.cpp +++ b/live/src/v1/model/CreateOttChannelInfoReq.cpp @@ -26,6 +26,7 @@ CreateOttChannelInfoReq::CreateOttChannelInfoReq() encoderSettingsIsSet_ = false; recordSettingsIsSet_ = false; endpointsIsSet_ = false; + encoderSettingsExpandIsSet_ = false; } CreateOttChannelInfoReq::~CreateOttChannelInfoReq() = default; @@ -65,6 +66,9 @@ web::json::value CreateOttChannelInfoReq::toJson() const if(endpointsIsSet_) { val[utility::conversions::to_string_t("endpoints")] = ModelBase::toJson(endpoints_); } + if(encoderSettingsExpandIsSet_) { + val[utility::conversions::to_string_t("encoder_settings_expand")] = ModelBase::toJson(encoderSettingsExpand_); + } return val; } @@ -153,6 +157,15 @@ bool CreateOttChannelInfoReq::fromJson(const web::json::value& val) setEndpoints(refVal); } } + if(val.has_field(utility::conversions::to_string_t("encoder_settings_expand"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("encoder_settings_expand")); + if(!fieldValue.is_null()) + { + EncoderSettingsExpand refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setEncoderSettingsExpand(refVal); + } + } return ok; } @@ -346,6 +359,27 @@ void CreateOttChannelInfoReq::unsetendpoints() endpointsIsSet_ = false; } +EncoderSettingsExpand CreateOttChannelInfoReq::getEncoderSettingsExpand() const +{ + return encoderSettingsExpand_; +} + +void CreateOttChannelInfoReq::setEncoderSettingsExpand(const EncoderSettingsExpand& value) +{ + encoderSettingsExpand_ = value; + encoderSettingsExpandIsSet_ = true; +} + +bool CreateOttChannelInfoReq::encoderSettingsExpandIsSet() const +{ + return encoderSettingsExpandIsSet_; +} + +void CreateOttChannelInfoReq::unsetencoderSettingsExpand() +{ + encoderSettingsExpandIsSet_ = false; +} + } } } diff --git a/live/src/v1/model/DashPackageItem.cpp b/live/src/v1/model/DashPackageItem.cpp index 9239abb33..6e50e7f97 100644 --- a/live/src/v1/model/DashPackageItem.cpp +++ b/live/src/v1/model/DashPackageItem.cpp @@ -23,6 +23,8 @@ DashPackageItem::DashPackageItem() adsIsSet_ = false; extArgsIsSet_ = false; requestArgsIsSet_ = false; + adMarker_ = ""; + adMarkerIsSet_ = false; } DashPackageItem::~DashPackageItem() = default; @@ -59,6 +61,9 @@ web::json::value DashPackageItem::toJson() const if(requestArgsIsSet_) { val[utility::conversions::to_string_t("request_args")] = ModelBase::toJson(requestArgs_); } + if(adMarkerIsSet_) { + val[utility::conversions::to_string_t("ad_marker")] = ModelBase::toJson(adMarker_); + } return val; } @@ -138,6 +143,15 @@ bool DashPackageItem::fromJson(const web::json::value& val) setRequestArgs(refVal); } } + if(val.has_field(utility::conversions::to_string_t("ad_marker"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("ad_marker")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAdMarker(refVal); + } + } return ok; } @@ -310,6 +324,27 @@ void DashPackageItem::unsetrequestArgs() requestArgsIsSet_ = false; } +std::string DashPackageItem::getAdMarker() const +{ + return adMarker_; +} + +void DashPackageItem::setAdMarker(const std::string& value) +{ + adMarker_ = value; + adMarkerIsSet_ = true; +} + +bool DashPackageItem::adMarkerIsSet() const +{ + return adMarkerIsSet_; +} + +void DashPackageItem::unsetadMarker() +{ + adMarkerIsSet_ = false; +} + } } } diff --git a/live/src/v1/model/DeleteOttChannelInfoResponse.cpp b/live/src/v1/model/DeleteOttChannelInfoResponse.cpp index 3c870ad40..7fc7dea9f 100644 --- a/live/src/v1/model/DeleteOttChannelInfoResponse.cpp +++ b/live/src/v1/model/DeleteOttChannelInfoResponse.cpp @@ -22,7 +22,6 @@ DeleteOttChannelInfoResponse::DeleteOttChannelInfoResponse() appNameIsSet_ = false; id_ = ""; idIsSet_ = false; - sourcesIsSet_ = false; } DeleteOttChannelInfoResponse::~DeleteOttChannelInfoResponse() = default; @@ -50,9 +49,6 @@ web::json::value DeleteOttChannelInfoResponse::toJson() const if(idIsSet_) { val[utility::conversions::to_string_t("id")] = ModelBase::toJson(id_); } - if(sourcesIsSet_) { - val[utility::conversions::to_string_t("sources")] = ModelBase::toJson(sources_); - } return val; } @@ -105,15 +101,6 @@ bool DeleteOttChannelInfoResponse::fromJson(const web::json::value& val) setId(refVal); } } - if(val.has_field(utility::conversions::to_string_t("sources"))) { - const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("sources")); - if(!fieldValue.is_null()) - { - std::vector refVal; - ok &= ModelBase::fromJson(fieldValue, refVal); - setSources(refVal); - } - } return ok; } @@ -223,27 +210,6 @@ void DeleteOttChannelInfoResponse::unsetid() idIsSet_ = false; } -std::vector& DeleteOttChannelInfoResponse::getSources() -{ - return sources_; -} - -void DeleteOttChannelInfoResponse::setSources(const std::vector& value) -{ - sources_ = value; - sourcesIsSet_ = true; -} - -bool DeleteOttChannelInfoResponse::sourcesIsSet() const -{ - return sourcesIsSet_; -} - -void DeleteOttChannelInfoResponse::unsetsources() -{ - sourcesIsSet_ = false; -} - } } } diff --git a/live/src/v1/model/EncoderSettingsExpand.cpp b/live/src/v1/model/EncoderSettingsExpand.cpp new file mode 100644 index 000000000..fa93178e3 --- /dev/null +++ b/live/src/v1/model/EncoderSettingsExpand.cpp @@ -0,0 +1,78 @@ + + +#include "huaweicloud/live/v1/model/EncoderSettingsExpand.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +EncoderSettingsExpand::EncoderSettingsExpand() +{ + audioDescriptionsIsSet_ = false; +} + +EncoderSettingsExpand::~EncoderSettingsExpand() = default; + +void EncoderSettingsExpand::validate() +{ +} + +web::json::value EncoderSettingsExpand::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(audioDescriptionsIsSet_) { + val[utility::conversions::to_string_t("audio_descriptions")] = ModelBase::toJson(audioDescriptions_); + } + + return val; +} +bool EncoderSettingsExpand::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("audio_descriptions"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("audio_descriptions")); + if(!fieldValue.is_null()) + { + std::vector refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAudioDescriptions(refVal); + } + } + return ok; +} + + +std::vector& EncoderSettingsExpand::getAudioDescriptions() +{ + return audioDescriptions_; +} + +void EncoderSettingsExpand::setAudioDescriptions(const std::vector& value) +{ + audioDescriptions_ = value; + audioDescriptionsIsSet_ = true; +} + +bool EncoderSettingsExpand::audioDescriptionsIsSet() const +{ + return audioDescriptionsIsSet_; +} + +void EncoderSettingsExpand::unsetaudioDescriptions() +{ + audioDescriptionsIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/EncoderSettingsExpand_audio_descriptions.cpp b/live/src/v1/model/EncoderSettingsExpand_audio_descriptions.cpp new file mode 100644 index 000000000..1c60467b4 --- /dev/null +++ b/live/src/v1/model/EncoderSettingsExpand_audio_descriptions.cpp @@ -0,0 +1,219 @@ + + +#include "huaweicloud/live/v1/model/EncoderSettingsExpand_audio_descriptions.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +EncoderSettingsExpand_audio_descriptions::EncoderSettingsExpand_audio_descriptions() +{ + name_ = ""; + nameIsSet_ = false; + audioSelectorName_ = ""; + audioSelectorNameIsSet_ = false; + languageCodeControl_ = ""; + languageCodeControlIsSet_ = false; + languageCode_ = ""; + languageCodeIsSet_ = false; + streamName_ = ""; + streamNameIsSet_ = false; +} + +EncoderSettingsExpand_audio_descriptions::~EncoderSettingsExpand_audio_descriptions() = default; + +void EncoderSettingsExpand_audio_descriptions::validate() +{ +} + +web::json::value EncoderSettingsExpand_audio_descriptions::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(nameIsSet_) { + val[utility::conversions::to_string_t("name")] = ModelBase::toJson(name_); + } + if(audioSelectorNameIsSet_) { + val[utility::conversions::to_string_t("audio_selector_name")] = ModelBase::toJson(audioSelectorName_); + } + if(languageCodeControlIsSet_) { + val[utility::conversions::to_string_t("language_code_control")] = ModelBase::toJson(languageCodeControl_); + } + if(languageCodeIsSet_) { + val[utility::conversions::to_string_t("language_code")] = ModelBase::toJson(languageCode_); + } + if(streamNameIsSet_) { + val[utility::conversions::to_string_t("stream_name")] = ModelBase::toJson(streamName_); + } + + return val; +} +bool EncoderSettingsExpand_audio_descriptions::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("name"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("name")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setName(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("audio_selector_name"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("audio_selector_name")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAudioSelectorName(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("language_code_control"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("language_code_control")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setLanguageCodeControl(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("language_code"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("language_code")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setLanguageCode(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("stream_name"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("stream_name")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setStreamName(refVal); + } + } + return ok; +} + + +std::string EncoderSettingsExpand_audio_descriptions::getName() const +{ + return name_; +} + +void EncoderSettingsExpand_audio_descriptions::setName(const std::string& value) +{ + name_ = value; + nameIsSet_ = true; +} + +bool EncoderSettingsExpand_audio_descriptions::nameIsSet() const +{ + return nameIsSet_; +} + +void EncoderSettingsExpand_audio_descriptions::unsetname() +{ + nameIsSet_ = false; +} + +std::string EncoderSettingsExpand_audio_descriptions::getAudioSelectorName() const +{ + return audioSelectorName_; +} + +void EncoderSettingsExpand_audio_descriptions::setAudioSelectorName(const std::string& value) +{ + audioSelectorName_ = value; + audioSelectorNameIsSet_ = true; +} + +bool EncoderSettingsExpand_audio_descriptions::audioSelectorNameIsSet() const +{ + return audioSelectorNameIsSet_; +} + +void EncoderSettingsExpand_audio_descriptions::unsetaudioSelectorName() +{ + audioSelectorNameIsSet_ = false; +} + +std::string EncoderSettingsExpand_audio_descriptions::getLanguageCodeControl() const +{ + return languageCodeControl_; +} + +void EncoderSettingsExpand_audio_descriptions::setLanguageCodeControl(const std::string& value) +{ + languageCodeControl_ = value; + languageCodeControlIsSet_ = true; +} + +bool EncoderSettingsExpand_audio_descriptions::languageCodeControlIsSet() const +{ + return languageCodeControlIsSet_; +} + +void EncoderSettingsExpand_audio_descriptions::unsetlanguageCodeControl() +{ + languageCodeControlIsSet_ = false; +} + +std::string EncoderSettingsExpand_audio_descriptions::getLanguageCode() const +{ + return languageCode_; +} + +void EncoderSettingsExpand_audio_descriptions::setLanguageCode(const std::string& value) +{ + languageCode_ = value; + languageCodeIsSet_ = true; +} + +bool EncoderSettingsExpand_audio_descriptions::languageCodeIsSet() const +{ + return languageCodeIsSet_; +} + +void EncoderSettingsExpand_audio_descriptions::unsetlanguageCode() +{ + languageCodeIsSet_ = false; +} + +std::string EncoderSettingsExpand_audio_descriptions::getStreamName() const +{ + return streamName_; +} + +void EncoderSettingsExpand_audio_descriptions::setStreamName(const std::string& value) +{ + streamName_ = value; + streamNameIsSet_ = true; +} + +bool EncoderSettingsExpand_audio_descriptions::streamNameIsSet() const +{ + return streamNameIsSet_; +} + +void EncoderSettingsExpand_audio_descriptions::unsetstreamName() +{ + streamNameIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/Encryption.cpp b/live/src/v1/model/Encryption.cpp index 0365ee0ec..4ba9de33e 100644 --- a/live/src/v1/model/Encryption.cpp +++ b/live/src/v1/model/Encryption.cpp @@ -18,13 +18,18 @@ Encryption::Encryption() encryptionMethodIsSet_ = false; level_ = ""; levelIsSet_ = false; - drmContentId_ = ""; - drmContentIdIsSet_ = false; + resourceId_ = ""; + resourceIdIsSet_ = false; systemIdsIsSet_ = false; - authInfo_ = ""; - authInfoIsSet_ = false; - kmUrl_ = ""; - kmUrlIsSet_ = false; + url_ = ""; + urlIsSet_ = false; + spekeVersion_ = ""; + spekeVersionIsSet_ = false; + requestMode_ = ""; + requestModeIsSet_ = false; + httpHeadersIsSet_ = false; + urn_ = ""; + urnIsSet_ = false; } Encryption::~Encryption() = default; @@ -46,17 +51,26 @@ web::json::value Encryption::toJson() const if(levelIsSet_) { val[utility::conversions::to_string_t("level")] = ModelBase::toJson(level_); } - if(drmContentIdIsSet_) { - val[utility::conversions::to_string_t("drm_content_id")] = ModelBase::toJson(drmContentId_); + if(resourceIdIsSet_) { + val[utility::conversions::to_string_t("resource_id")] = ModelBase::toJson(resourceId_); } if(systemIdsIsSet_) { val[utility::conversions::to_string_t("system_ids")] = ModelBase::toJson(systemIds_); } - if(authInfoIsSet_) { - val[utility::conversions::to_string_t("auth_info")] = ModelBase::toJson(authInfo_); + if(urlIsSet_) { + val[utility::conversions::to_string_t("url")] = ModelBase::toJson(url_); } - if(kmUrlIsSet_) { - val[utility::conversions::to_string_t("km_url")] = ModelBase::toJson(kmUrl_); + if(spekeVersionIsSet_) { + val[utility::conversions::to_string_t("speke_version")] = ModelBase::toJson(spekeVersion_); + } + if(requestModeIsSet_) { + val[utility::conversions::to_string_t("request_mode")] = ModelBase::toJson(requestMode_); + } + if(httpHeadersIsSet_) { + val[utility::conversions::to_string_t("http_headers")] = ModelBase::toJson(httpHeaders_); + } + if(urnIsSet_) { + val[utility::conversions::to_string_t("urn")] = ModelBase::toJson(urn_); } return val; @@ -92,13 +106,13 @@ bool Encryption::fromJson(const web::json::value& val) setLevel(refVal); } } - if(val.has_field(utility::conversions::to_string_t("drm_content_id"))) { - const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("drm_content_id")); + if(val.has_field(utility::conversions::to_string_t("resource_id"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_id")); if(!fieldValue.is_null()) { std::string refVal; ok &= ModelBase::fromJson(fieldValue, refVal); - setDrmContentId(refVal); + setResourceId(refVal); } } if(val.has_field(utility::conversions::to_string_t("system_ids"))) { @@ -110,22 +124,49 @@ bool Encryption::fromJson(const web::json::value& val) setSystemIds(refVal); } } - if(val.has_field(utility::conversions::to_string_t("auth_info"))) { - const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("auth_info")); + if(val.has_field(utility::conversions::to_string_t("url"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("url")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setUrl(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("speke_version"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("speke_version")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setSpekeVersion(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("request_mode"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("request_mode")); if(!fieldValue.is_null()) { std::string refVal; ok &= ModelBase::fromJson(fieldValue, refVal); - setAuthInfo(refVal); + setRequestMode(refVal); } } - if(val.has_field(utility::conversions::to_string_t("km_url"))) { - const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("km_url")); + if(val.has_field(utility::conversions::to_string_t("http_headers"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("http_headers")); + if(!fieldValue.is_null()) + { + std::vector refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setHttpHeaders(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("urn"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("urn")); if(!fieldValue.is_null()) { std::string refVal; ok &= ModelBase::fromJson(fieldValue, refVal); - setKmUrl(refVal); + setUrn(refVal); } } return ok; @@ -195,25 +236,25 @@ void Encryption::unsetlevel() levelIsSet_ = false; } -std::string Encryption::getDrmContentId() const +std::string Encryption::getResourceId() const { - return drmContentId_; + return resourceId_; } -void Encryption::setDrmContentId(const std::string& value) +void Encryption::setResourceId(const std::string& value) { - drmContentId_ = value; - drmContentIdIsSet_ = true; + resourceId_ = value; + resourceIdIsSet_ = true; } -bool Encryption::drmContentIdIsSet() const +bool Encryption::resourceIdIsSet() const { - return drmContentIdIsSet_; + return resourceIdIsSet_; } -void Encryption::unsetdrmContentId() +void Encryption::unsetresourceId() { - drmContentIdIsSet_ = false; + resourceIdIsSet_ = false; } std::vector& Encryption::getSystemIds() @@ -237,46 +278,109 @@ void Encryption::unsetsystemIds() systemIdsIsSet_ = false; } -std::string Encryption::getAuthInfo() const +std::string Encryption::getUrl() const +{ + return url_; +} + +void Encryption::setUrl(const std::string& value) +{ + url_ = value; + urlIsSet_ = true; +} + +bool Encryption::urlIsSet() const +{ + return urlIsSet_; +} + +void Encryption::unseturl() +{ + urlIsSet_ = false; +} + +std::string Encryption::getSpekeVersion() const +{ + return spekeVersion_; +} + +void Encryption::setSpekeVersion(const std::string& value) +{ + spekeVersion_ = value; + spekeVersionIsSet_ = true; +} + +bool Encryption::spekeVersionIsSet() const +{ + return spekeVersionIsSet_; +} + +void Encryption::unsetspekeVersion() +{ + spekeVersionIsSet_ = false; +} + +std::string Encryption::getRequestMode() const +{ + return requestMode_; +} + +void Encryption::setRequestMode(const std::string& value) +{ + requestMode_ = value; + requestModeIsSet_ = true; +} + +bool Encryption::requestModeIsSet() const +{ + return requestModeIsSet_; +} + +void Encryption::unsetrequestMode() +{ + requestModeIsSet_ = false; +} + +std::vector& Encryption::getHttpHeaders() { - return authInfo_; + return httpHeaders_; } -void Encryption::setAuthInfo(const std::string& value) +void Encryption::setHttpHeaders(const std::vector& value) { - authInfo_ = value; - authInfoIsSet_ = true; + httpHeaders_ = value; + httpHeadersIsSet_ = true; } -bool Encryption::authInfoIsSet() const +bool Encryption::httpHeadersIsSet() const { - return authInfoIsSet_; + return httpHeadersIsSet_; } -void Encryption::unsetauthInfo() +void Encryption::unsethttpHeaders() { - authInfoIsSet_ = false; + httpHeadersIsSet_ = false; } -std::string Encryption::getKmUrl() const +std::string Encryption::getUrn() const { - return kmUrl_; + return urn_; } -void Encryption::setKmUrl(const std::string& value) +void Encryption::setUrn(const std::string& value) { - kmUrl_ = value; - kmUrlIsSet_ = true; + urn_ = value; + urnIsSet_ = true; } -bool Encryption::kmUrlIsSet() const +bool Encryption::urnIsSet() const { - return kmUrlIsSet_; + return urnIsSet_; } -void Encryption::unsetkmUrl() +void Encryption::unseturn() { - kmUrlIsSet_ = false; + urnIsSet_ = false; } } diff --git a/live/src/v1/model/HlsPackageItem.cpp b/live/src/v1/model/HlsPackageItem.cpp index cf8d23c43..d46e29f55 100644 --- a/live/src/v1/model/HlsPackageItem.cpp +++ b/live/src/v1/model/HlsPackageItem.cpp @@ -25,6 +25,7 @@ HlsPackageItem::HlsPackageItem() adsIsSet_ = false; extArgsIsSet_ = false; requestArgsIsSet_ = false; + adMarkerIsSet_ = false; } HlsPackageItem::~HlsPackageItem() = default; @@ -64,6 +65,9 @@ web::json::value HlsPackageItem::toJson() const if(requestArgsIsSet_) { val[utility::conversions::to_string_t("request_args")] = ModelBase::toJson(requestArgs_); } + if(adMarkerIsSet_) { + val[utility::conversions::to_string_t("ad_marker")] = ModelBase::toJson(adMarker_); + } return val; } @@ -152,6 +156,15 @@ bool HlsPackageItem::fromJson(const web::json::value& val) setRequestArgs(refVal); } } + if(val.has_field(utility::conversions::to_string_t("ad_marker"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("ad_marker")); + if(!fieldValue.is_null()) + { + std::vector refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAdMarker(refVal); + } + } return ok; } @@ -345,6 +358,27 @@ void HlsPackageItem::unsetrequestArgs() requestArgsIsSet_ = false; } +std::vector& HlsPackageItem::getAdMarker() +{ + return adMarker_; +} + +void HlsPackageItem::setAdMarker(const std::vector& value) +{ + adMarker_ = value; + adMarkerIsSet_ = true; +} + +bool HlsPackageItem::adMarkerIsSet() const +{ + return adMarkerIsSet_; +} + +void HlsPackageItem::unsetadMarker() +{ + adMarkerIsSet_ = false; +} + } } } diff --git a/live/src/v1/model/HttpHeader.cpp b/live/src/v1/model/HttpHeader.cpp new file mode 100644 index 000000000..af305211e --- /dev/null +++ b/live/src/v1/model/HttpHeader.cpp @@ -0,0 +1,114 @@ + + +#include "huaweicloud/live/v1/model/HttpHeader.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +HttpHeader::HttpHeader() +{ + key_ = ""; + keyIsSet_ = false; + value_ = ""; + valueIsSet_ = false; +} + +HttpHeader::~HttpHeader() = default; + +void HttpHeader::validate() +{ +} + +web::json::value HttpHeader::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(keyIsSet_) { + val[utility::conversions::to_string_t("key")] = ModelBase::toJson(key_); + } + if(valueIsSet_) { + val[utility::conversions::to_string_t("value")] = ModelBase::toJson(value_); + } + + return val; +} +bool HttpHeader::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("key"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("key")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setKey(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("value"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("value")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setValue(refVal); + } + } + return ok; +} + + +std::string HttpHeader::getKey() const +{ + return key_; +} + +void HttpHeader::setKey(const std::string& value) +{ + key_ = value; + keyIsSet_ = true; +} + +bool HttpHeader::keyIsSet() const +{ + return keyIsSet_; +} + +void HttpHeader::unsetkey() +{ + keyIsSet_ = false; +} + +std::string HttpHeader::getValue() const +{ + return value_; +} + +void HttpHeader::setValue(const std::string& value) +{ + value_ = value; + valueIsSet_ = true; +} + +bool HttpHeader::valueIsSet() const +{ + return valueIsSet_; +} + +void HttpHeader::unsetvalue() +{ + valueIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/InputAudioSelector.cpp b/live/src/v1/model/InputAudioSelector.cpp new file mode 100644 index 000000000..33c9efd4b --- /dev/null +++ b/live/src/v1/model/InputAudioSelector.cpp @@ -0,0 +1,113 @@ + + +#include "huaweicloud/live/v1/model/InputAudioSelector.h" +namespace HuaweiCloud { +namespace Sdk { +namespace Live { +namespace V1 { +namespace Model { + + + + +InputAudioSelector::InputAudioSelector() +{ + name_ = ""; + nameIsSet_ = false; + selectorSettingsIsSet_ = false; +} + +InputAudioSelector::~InputAudioSelector() = default; + +void InputAudioSelector::validate() +{ +} + +web::json::value InputAudioSelector::toJson() const +{ + web::json::value val = web::json::value::object(); + + if(nameIsSet_) { + val[utility::conversions::to_string_t("name")] = ModelBase::toJson(name_); + } + if(selectorSettingsIsSet_) { + val[utility::conversions::to_string_t("selector_settings")] = ModelBase::toJson(selectorSettings_); + } + + return val; +} +bool InputAudioSelector::fromJson(const web::json::value& val) +{ + bool ok = true; + + if(val.has_field(utility::conversions::to_string_t("name"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("name")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setName(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("selector_settings"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("selector_settings")); + if(!fieldValue.is_null()) + { + AudioSelectorSettings refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setSelectorSettings(refVal); + } + } + return ok; +} + + +std::string InputAudioSelector::getName() const +{ + return name_; +} + +void InputAudioSelector::setName(const std::string& value) +{ + name_ = value; + nameIsSet_ = true; +} + +bool InputAudioSelector::nameIsSet() const +{ + return nameIsSet_; +} + +void InputAudioSelector::unsetname() +{ + nameIsSet_ = false; +} + +AudioSelectorSettings InputAudioSelector::getSelectorSettings() const +{ + return selectorSettings_; +} + +void InputAudioSelector::setSelectorSettings(const AudioSelectorSettings& value) +{ + selectorSettings_ = value; + selectorSettingsIsSet_ = true; +} + +bool InputAudioSelector::selectorSettingsIsSet() const +{ + return selectorSettingsIsSet_; +} + +void InputAudioSelector::unsetselectorSettings() +{ + selectorSettingsIsSet_ = false; +} + +} +} +} +} +} + + diff --git a/live/src/v1/model/InputStreamInfo.cpp b/live/src/v1/model/InputStreamInfo.cpp index e540c02ea..da7915ea4 100644 --- a/live/src/v1/model/InputStreamInfo.cpp +++ b/live/src/v1/model/InputStreamInfo.cpp @@ -21,6 +21,12 @@ InputStreamInfo::InputStreamInfo() maxBandwidthLimitIsSet_ = false; ipPortMode_ = false; ipPortModeIsSet_ = false; + ipWhitelist_ = ""; + ipWhitelistIsSet_ = false; + scte35Source_ = ""; + scte35SourceIsSet_ = false; + adTriggersIsSet_ = false; + audioSelectorsIsSet_ = false; } InputStreamInfo::~InputStreamInfo() = default; @@ -51,6 +57,18 @@ web::json::value InputStreamInfo::toJson() const if(ipPortModeIsSet_) { val[utility::conversions::to_string_t("ip_port_mode")] = ModelBase::toJson(ipPortMode_); } + if(ipWhitelistIsSet_) { + val[utility::conversions::to_string_t("ip_whitelist")] = ModelBase::toJson(ipWhitelist_); + } + if(scte35SourceIsSet_) { + val[utility::conversions::to_string_t("scte35_source")] = ModelBase::toJson(scte35Source_); + } + if(adTriggersIsSet_) { + val[utility::conversions::to_string_t("ad_triggers")] = ModelBase::toJson(adTriggers_); + } + if(audioSelectorsIsSet_) { + val[utility::conversions::to_string_t("audio_selectors")] = ModelBase::toJson(audioSelectors_); + } return val; } @@ -112,6 +130,42 @@ bool InputStreamInfo::fromJson(const web::json::value& val) setIpPortMode(refVal); } } + if(val.has_field(utility::conversions::to_string_t("ip_whitelist"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("ip_whitelist")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setIpWhitelist(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("scte35_source"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("scte35_source")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setScte35Source(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("ad_triggers"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("ad_triggers")); + if(!fieldValue.is_null()) + { + std::vector refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAdTriggers(refVal); + } + } + if(val.has_field(utility::conversions::to_string_t("audio_selectors"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("audio_selectors")); + if(!fieldValue.is_null()) + { + std::vector refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setAudioSelectors(refVal); + } + } return ok; } @@ -242,6 +296,90 @@ void InputStreamInfo::unsetipPortMode() ipPortModeIsSet_ = false; } +std::string InputStreamInfo::getIpWhitelist() const +{ + return ipWhitelist_; +} + +void InputStreamInfo::setIpWhitelist(const std::string& value) +{ + ipWhitelist_ = value; + ipWhitelistIsSet_ = true; +} + +bool InputStreamInfo::ipWhitelistIsSet() const +{ + return ipWhitelistIsSet_; +} + +void InputStreamInfo::unsetipWhitelist() +{ + ipWhitelistIsSet_ = false; +} + +std::string InputStreamInfo::getScte35Source() const +{ + return scte35Source_; +} + +void InputStreamInfo::setScte35Source(const std::string& value) +{ + scte35Source_ = value; + scte35SourceIsSet_ = true; +} + +bool InputStreamInfo::scte35SourceIsSet() const +{ + return scte35SourceIsSet_; +} + +void InputStreamInfo::unsetscte35Source() +{ + scte35SourceIsSet_ = false; +} + +std::vector& InputStreamInfo::getAdTriggers() +{ + return adTriggers_; +} + +void InputStreamInfo::setAdTriggers(const std::vector& value) +{ + adTriggers_ = value; + adTriggersIsSet_ = true; +} + +bool InputStreamInfo::adTriggersIsSet() const +{ + return adTriggersIsSet_; +} + +void InputStreamInfo::unsetadTriggers() +{ + adTriggersIsSet_ = false; +} + +std::vector& InputStreamInfo::getAudioSelectors() +{ + return audioSelectors_; +} + +void InputStreamInfo::setAudioSelectors(const std::vector& value) +{ + audioSelectors_ = value; + audioSelectorsIsSet_ = true; +} + +bool InputStreamInfo::audioSelectorsIsSet() const +{ + return audioSelectorsIsSet_; +} + +void InputStreamInfo::unsetaudioSelectors() +{ + audioSelectorsIsSet_ = false; +} + } } } diff --git a/live/src/v1/model/ModifyOttChannelEncoderSettings.cpp b/live/src/v1/model/ModifyOttChannelEncoderSettings.cpp index 4302c6e69..0c3735d81 100644 --- a/live/src/v1/model/ModifyOttChannelEncoderSettings.cpp +++ b/live/src/v1/model/ModifyOttChannelEncoderSettings.cpp @@ -19,6 +19,7 @@ ModifyOttChannelEncoderSettings::ModifyOttChannelEncoderSettings() id_ = ""; idIsSet_ = false; encoderSettingsIsSet_ = false; + encoderSettingsExpandIsSet_ = false; } ModifyOttChannelEncoderSettings::~ModifyOttChannelEncoderSettings() = default; @@ -43,6 +44,9 @@ web::json::value ModifyOttChannelEncoderSettings::toJson() const if(encoderSettingsIsSet_) { val[utility::conversions::to_string_t("encoder_settings")] = ModelBase::toJson(encoderSettings_); } + if(encoderSettingsExpandIsSet_) { + val[utility::conversions::to_string_t("encoder_settings_expand")] = ModelBase::toJson(encoderSettingsExpand_); + } return val; } @@ -86,6 +90,15 @@ bool ModifyOttChannelEncoderSettings::fromJson(const web::json::value& val) setEncoderSettings(refVal); } } + if(val.has_field(utility::conversions::to_string_t("encoder_settings_expand"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("encoder_settings_expand")); + if(!fieldValue.is_null()) + { + EncoderSettingsExpand refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setEncoderSettingsExpand(refVal); + } + } return ok; } @@ -174,6 +187,27 @@ void ModifyOttChannelEncoderSettings::unsetencoderSettings() encoderSettingsIsSet_ = false; } +EncoderSettingsExpand ModifyOttChannelEncoderSettings::getEncoderSettingsExpand() const +{ + return encoderSettingsExpand_; +} + +void ModifyOttChannelEncoderSettings::setEncoderSettingsExpand(const EncoderSettingsExpand& value) +{ + encoderSettingsExpand_ = value; + encoderSettingsExpandIsSet_ = true; +} + +bool ModifyOttChannelEncoderSettings::encoderSettingsExpandIsSet() const +{ + return encoderSettingsExpandIsSet_; +} + +void ModifyOttChannelEncoderSettings::unsetencoderSettingsExpand() +{ + encoderSettingsExpandIsSet_ = false; +} + } } } diff --git a/live/src/v1/model/ModifyOttChannelInfoRecordSettingsResponse.cpp b/live/src/v1/model/ModifyOttChannelInfoRecordSettingsResponse.cpp index 268b97a58..3585b7eb5 100644 --- a/live/src/v1/model/ModifyOttChannelInfoRecordSettingsResponse.cpp +++ b/live/src/v1/model/ModifyOttChannelInfoRecordSettingsResponse.cpp @@ -22,7 +22,6 @@ ModifyOttChannelInfoRecordSettingsResponse::ModifyOttChannelInfoRecordSettingsRe appNameIsSet_ = false; id_ = ""; idIsSet_ = false; - sourcesIsSet_ = false; } ModifyOttChannelInfoRecordSettingsResponse::~ModifyOttChannelInfoRecordSettingsResponse() = default; @@ -50,9 +49,6 @@ web::json::value ModifyOttChannelInfoRecordSettingsResponse::toJson() const if(idIsSet_) { val[utility::conversions::to_string_t("id")] = ModelBase::toJson(id_); } - if(sourcesIsSet_) { - val[utility::conversions::to_string_t("sources")] = ModelBase::toJson(sources_); - } return val; } @@ -105,15 +101,6 @@ bool ModifyOttChannelInfoRecordSettingsResponse::fromJson(const web::json::value setId(refVal); } } - if(val.has_field(utility::conversions::to_string_t("sources"))) { - const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("sources")); - if(!fieldValue.is_null()) - { - std::vector refVal; - ok &= ModelBase::fromJson(fieldValue, refVal); - setSources(refVal); - } - } return ok; } @@ -223,27 +210,6 @@ void ModifyOttChannelInfoRecordSettingsResponse::unsetid() idIsSet_ = false; } -std::vector& ModifyOttChannelInfoRecordSettingsResponse::getSources() -{ - return sources_; -} - -void ModifyOttChannelInfoRecordSettingsResponse::setSources(const std::vector& value) -{ - sources_ = value; - sourcesIsSet_ = true; -} - -bool ModifyOttChannelInfoRecordSettingsResponse::sourcesIsSet() const -{ - return sourcesIsSet_; -} - -void ModifyOttChannelInfoRecordSettingsResponse::unsetsources() -{ - sourcesIsSet_ = false; -} - } } } diff --git a/ram/include/huaweicloud/ram/v1/RamClient.h b/ram/include/huaweicloud/ram/v1/RamClient.h index 78c35bd8f..0f6d4f40a 100644 --- a/ram/include/huaweicloud/ram/v1/RamClient.h +++ b/ram/include/huaweicloud/ram/v1/RamClient.h @@ -28,6 +28,7 @@ #include #include #include +#include #include #include @@ -40,10 +41,12 @@ #include #include #include +#include #include #include #include +#include #include #include @@ -267,9 +270,9 @@ class HUAWEICLOUD_RAM_V1_EXPORT RamClient : public Client std::shared_ptr associateResourceShare( AssociateResourceShareRequest &request ); - // 移除资源使用者和共享资源 + // 移除资源使用者或共享资源 // - // 将指定的资源使用者或共享资源从指定的资源共享实例中移除。 + // 将指定的资源使用者或共享资源从指定的资源共享实例中移除。资源使用者也可以从指定的资源共享实例中主动退出。 // // Please refer to HUAWEI cloud API Explorer for details. std::shared_ptr disassociateResourceShare( diff --git a/ram/include/huaweicloud/ram/v1/model/AcceptResourceShareInvitationRequest.h b/ram/include/huaweicloud/ram/v1/model/AcceptResourceShareInvitationRequest.h index 36529f5f4..979025a59 100644 --- a/ram/include/huaweicloud/ram/v1/model/AcceptResourceShareInvitationRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/AcceptResourceShareInvitationRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT AcceptResourceShareInvitationRequest ///////////////////////////////////////////// /// AcceptResourceShareInvitationRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享邀请的ID。 /// @@ -49,6 +58,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT AcceptResourceShareInvitationRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareInvitationId_; bool resourceShareInvitationIdIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/AssociateResourceSharePermissionRequest.h b/ram/include/huaweicloud/ram/v1/model/AssociateResourceSharePermissionRequest.h index 48cf10d97..0c760e6fc 100644 --- a/ram/include/huaweicloud/ram/v1/model/AssociateResourceSharePermissionRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/AssociateResourceSharePermissionRequest.h @@ -39,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT AssociateResourceSharePermissionRequest ///////////////////////////////////////////// /// AssociateResourceSharePermissionRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -59,6 +68,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT AssociateResourceSharePermissionRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; AssociatePermissionReqBody body_; diff --git a/ram/include/huaweicloud/ram/v1/model/AssociateResourceShareRequest.h b/ram/include/huaweicloud/ram/v1/model/AssociateResourceShareRequest.h index 5226058bf..1fa40a2de 100644 --- a/ram/include/huaweicloud/ram/v1/model/AssociateResourceShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/AssociateResourceShareRequest.h @@ -39,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT AssociateResourceShareRequest ///////////////////////////////////////////// /// AssociateResourceShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -59,6 +68,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT AssociateResourceShareRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; ResourceShareAssociationReqBody body_; diff --git a/ram/include/huaweicloud/ram/v1/model/BatchCreateResourceShareTagsRequest.h b/ram/include/huaweicloud/ram/v1/model/BatchCreateResourceShareTagsRequest.h index eb0f0d58e..4c5e6b00a 100644 --- a/ram/include/huaweicloud/ram/v1/model/BatchCreateResourceShareTagsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/BatchCreateResourceShareTagsRequest.h @@ -48,6 +48,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT BatchCreateResourceShareTagsRequest void unsetresourceShareId(); void setResourceShareId(const std::string& value); + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -61,6 +70,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT BatchCreateResourceShareTagsRequest protected: std::string resourceShareId_; bool resourceShareIdIsSet_; + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; TagResourceReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/BatchDeleteResourceShareTagsRequest.h b/ram/include/huaweicloud/ram/v1/model/BatchDeleteResourceShareTagsRequest.h index ded29d36a..9870b4a37 100644 --- a/ram/include/huaweicloud/ram/v1/model/BatchDeleteResourceShareTagsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/BatchDeleteResourceShareTagsRequest.h @@ -48,6 +48,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT BatchDeleteResourceShareTagsRequest void unsetresourceShareId(); void setResourceShareId(const std::string& value); + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -61,6 +70,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT BatchDeleteResourceShareTagsRequest protected: std::string resourceShareId_; bool resourceShareIdIsSet_; + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; UntagResourceReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/CreateResourceShareRequest.h b/ram/include/huaweicloud/ram/v1/model/CreateResourceShareRequest.h index f0369f5e4..ba3cebb1c 100644 --- a/ram/include/huaweicloud/ram/v1/model/CreateResourceShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/CreateResourceShareRequest.h @@ -10,6 +10,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT CreateResourceShareRequest ///////////////////////////////////////////// /// CreateResourceShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT CreateResourceShareRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; CreateResourceShareReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/DeleteResourceShareRequest.h b/ram/include/huaweicloud/ram/v1/model/DeleteResourceShareRequest.h index 1e3423e17..78bc148a6 100644 --- a/ram/include/huaweicloud/ram/v1/model/DeleteResourceShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/DeleteResourceShareRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT DeleteResourceShareRequest ///////////////////////////////////////////// /// DeleteResourceShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -49,6 +58,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT DeleteResourceShareRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/DisableOrganizationShareRequest.h b/ram/include/huaweicloud/ram/v1/model/DisableOrganizationShareRequest.h index 57d2e5619..f9fe3d718 100644 --- a/ram/include/huaweicloud/ram/v1/model/DisableOrganizationShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/DisableOrganizationShareRequest.h @@ -9,6 +9,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -37,8 +38,19 @@ class HUAWEICLOUD_RAM_V1_EXPORT DisableOrganizationShareRequest ///////////////////////////////////////////// /// DisableOrganizationShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/ram/include/huaweicloud/ram/v1/model/DisassociateResourceSharePermissionRequest.h b/ram/include/huaweicloud/ram/v1/model/DisassociateResourceSharePermissionRequest.h index 5ca6bba4a..0ed02262f 100644 --- a/ram/include/huaweicloud/ram/v1/model/DisassociateResourceSharePermissionRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/DisassociateResourceSharePermissionRequest.h @@ -39,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT DisassociateResourceSharePermissionRequest ///////////////////////////////////////////// /// DisassociateResourceSharePermissionRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -59,6 +68,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT DisassociateResourceSharePermissionRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; DisassociatePermissionReqBody body_; diff --git a/ram/include/huaweicloud/ram/v1/model/DisassociateResourceShareRequest.h b/ram/include/huaweicloud/ram/v1/model/DisassociateResourceShareRequest.h index 24f57f04f..d3a392cae 100644 --- a/ram/include/huaweicloud/ram/v1/model/DisassociateResourceShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/DisassociateResourceShareRequest.h @@ -39,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT DisassociateResourceShareRequest ///////////////////////////////////////////// /// DisassociateResourceShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -59,6 +68,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT DisassociateResourceShareRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; ResourceShareAssociationReqBody body_; diff --git a/ram/include/huaweicloud/ram/v1/model/EnableOrganizationShareRequest.h b/ram/include/huaweicloud/ram/v1/model/EnableOrganizationShareRequest.h index 6d42dfd34..4453444e8 100644 --- a/ram/include/huaweicloud/ram/v1/model/EnableOrganizationShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/EnableOrganizationShareRequest.h @@ -9,6 +9,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -37,8 +38,19 @@ class HUAWEICLOUD_RAM_V1_EXPORT EnableOrganizationShareRequest ///////////////////////////////////////////// /// EnableOrganizationShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/ram/include/huaweicloud/ram/v1/model/ListPermissionVersionsRequest.h b/ram/include/huaweicloud/ram/v1/model/ListPermissionVersionsRequest.h index 5105e0a9d..3f97d2f63 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListPermissionVersionsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListPermissionVersionsRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListPermissionVersionsRequest ///////////////////////////////////////////// /// ListPermissionVersionsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 分页页面的最大值。 /// @@ -67,6 +76,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListPermissionVersionsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; int32_t limit_; bool limitIsSet_; std::string marker_; diff --git a/ram/include/huaweicloud/ram/v1/model/ListPermissionsRequest.h b/ram/include/huaweicloud/ram/v1/model/ListPermissionsRequest.h index b8d8a2d33..1da377cb6 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListPermissionsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListPermissionsRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListPermissionsRequest ///////////////////////////////////////////// /// ListPermissionsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 分页页面的最大值。 /// @@ -76,6 +85,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListPermissionsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; int32_t limit_; bool limitIsSet_; std::string marker_; diff --git a/ram/include/huaweicloud/ram/v1/model/ListQuotaRequest.h b/ram/include/huaweicloud/ram/v1/model/ListQuotaRequest.h index 1bff2a81f..2c0a57e1f 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListQuotaRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListQuotaRequest.h @@ -9,6 +9,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -37,8 +38,19 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListQuotaRequest ///////////////////////////////////////////// /// ListQuotaRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/ram/include/huaweicloud/ram/v1/model/ListResourceSharePermissionsRequest.h b/ram/include/huaweicloud/ram/v1/model/ListResourceSharePermissionsRequest.h index 0eb45d6b8..df09a0d45 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListResourceSharePermissionsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListResourceSharePermissionsRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceSharePermissionsRequest ///////////////////////////////////////////// /// ListResourceSharePermissionsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -76,6 +85,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceSharePermissionsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; std::string permissionName_; diff --git a/ram/include/huaweicloud/ram/v1/model/ListResourceShareTagsRequest.h b/ram/include/huaweicloud/ram/v1/model/ListResourceShareTagsRequest.h index 4966dd61f..96223b42e 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListResourceShareTagsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListResourceShareTagsRequest.h @@ -56,12 +56,23 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceShareTagsRequest void unsetmarker(); void setMarker(const std::string& value); + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + protected: int32_t limit_; bool limitIsSet_; std::string marker_; bool markerIsSet_; + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/ram/include/huaweicloud/ram/v1/model/ListResourceSharesByTagsRequest.h b/ram/include/huaweicloud/ram/v1/model/ListResourceSharesByTagsRequest.h index f9fe4eba4..27cb3261a 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListResourceSharesByTagsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListResourceSharesByTagsRequest.h @@ -57,6 +57,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceSharesByTagsRequest void unsetoffset(); void setOffset(const std::string& value); + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -72,6 +81,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceSharesByTagsRequest bool limitIsSet_; std::string offset_; bool offsetIsSet_; + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; ResourceSharesByTagsReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/ListResourceTypesRequest.h b/ram/include/huaweicloud/ram/v1/model/ListResourceTypesRequest.h index b6fe37ca2..c22820ca6 100644 --- a/ram/include/huaweicloud/ram/v1/model/ListResourceTypesRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ListResourceTypesRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceTypesRequest ///////////////////////////////////////////// /// ListResourceTypesRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 分页页面的最大值。 /// @@ -58,6 +67,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ListResourceTypesRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; int32_t limit_; bool limitIsSet_; std::string marker_; diff --git a/ram/include/huaweicloud/ram/v1/model/RejectResourceShareInvitationRequest.h b/ram/include/huaweicloud/ram/v1/model/RejectResourceShareInvitationRequest.h index 44ff88984..a28c4f73a 100644 --- a/ram/include/huaweicloud/ram/v1/model/RejectResourceShareInvitationRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/RejectResourceShareInvitationRequest.h @@ -38,6 +38,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT RejectResourceShareInvitationRequest ///////////////////////////////////////////// /// RejectResourceShareInvitationRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享邀请的ID。 /// @@ -49,6 +58,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT RejectResourceShareInvitationRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareInvitationId_; bool resourceShareInvitationIdIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareAssociationsRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareAssociationsRequest.h index dae60b23f..6c5ac86c4 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareAssociationsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareAssociationsRequest.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace HuaweiCloud { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareAssociationsRequest ///////////////////////////////////////////// /// SearchResourceShareAssociationsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareAssociationsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; SearchResourceShareAssociationsReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareCountByTagsRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareCountByTagsRequest.h index d0ce1cc83..3c8e8a4df 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareCountByTagsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareCountByTagsRequest.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace HuaweiCloud { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareCountByTagsRequest ///////////////////////////////////////////// /// SearchResourceShareCountByTagsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareCountByTagsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; ResourceSharesByTagsReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareInvitationRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareInvitationRequest.h index cf14b9f73..5444482fc 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchResourceShareInvitationRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchResourceShareInvitationRequest.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace HuaweiCloud { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareInvitationRequest ///////////////////////////////////////////// /// SearchResourceShareInvitationRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceShareInvitationRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; SearchResourceShareInvitationReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchResourceSharesRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchResourceSharesRequest.h index cc220a934..dd2765b6e 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchResourceSharesRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchResourceSharesRequest.h @@ -9,6 +9,7 @@ #include #include +#include #include namespace HuaweiCloud { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceSharesRequest ///////////////////////////////////////////// /// SearchResourceSharesRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchResourceSharesRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; SearchResourceSharesReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchSharedPrincipalsRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchSharedPrincipalsRequest.h index a937d05f2..f998a1640 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchSharedPrincipalsRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchSharedPrincipalsRequest.h @@ -10,6 +10,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchSharedPrincipalsRequest ///////////////////////////////////////////// /// SearchSharedPrincipalsRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchSharedPrincipalsRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; SearchSharedPrincipalsReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/SearchSharedResourcesRequest.h b/ram/include/huaweicloud/ram/v1/model/SearchSharedResourcesRequest.h index 1570aaa94..09c8af894 100644 --- a/ram/include/huaweicloud/ram/v1/model/SearchSharedResourcesRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/SearchSharedResourcesRequest.h @@ -10,6 +10,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -38,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchSharedResourcesRequest ///////////////////////////////////////////// /// SearchSharedResourcesRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// /// @@ -49,6 +59,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT SearchSharedResourcesRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; SearchSharedResourcesReqBody body_; bool bodyIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/ShowOrganizationShareRequest.h b/ram/include/huaweicloud/ram/v1/model/ShowOrganizationShareRequest.h index 32a6880f0..be32ee48d 100644 --- a/ram/include/huaweicloud/ram/v1/model/ShowOrganizationShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ShowOrganizationShareRequest.h @@ -9,6 +9,7 @@ #include #include +#include namespace HuaweiCloud { namespace Sdk { @@ -37,8 +38,19 @@ class HUAWEICLOUD_RAM_V1_EXPORT ShowOrganizationShareRequest ///////////////////////////////////////////// /// ShowOrganizationShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; #ifdef RTTR_FLAG RTTR_ENABLE() diff --git a/ram/include/huaweicloud/ram/v1/model/ShowPermissionRequest.h b/ram/include/huaweicloud/ram/v1/model/ShowPermissionRequest.h index 5203413eb..a2945fcec 100644 --- a/ram/include/huaweicloud/ram/v1/model/ShowPermissionRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/ShowPermissionRequest.h @@ -47,6 +47,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT ShowPermissionRequest void unsetpermissionId(); void setPermissionId(const std::string& value); + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源权限版本。 /// @@ -60,6 +69,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT ShowPermissionRequest protected: std::string permissionId_; bool permissionIdIsSet_; + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; int32_t permissionVersion_; bool permissionVersionIsSet_; diff --git a/ram/include/huaweicloud/ram/v1/model/UpdateResourceShareRequest.h b/ram/include/huaweicloud/ram/v1/model/UpdateResourceShareRequest.h index b615e0ec0..052eb8135 100644 --- a/ram/include/huaweicloud/ram/v1/model/UpdateResourceShareRequest.h +++ b/ram/include/huaweicloud/ram/v1/model/UpdateResourceShareRequest.h @@ -39,6 +39,15 @@ class HUAWEICLOUD_RAM_V1_EXPORT UpdateResourceShareRequest ///////////////////////////////////////////// /// UpdateResourceShareRequest members + /// + /// 如果正在使用临时安全凭据，则此header是必需的，该值是临时安全凭据的安全令牌（会话令牌）。 + /// + + std::string getXSecurityToken() const; + bool xSecurityTokenIsSet() const; + void unsetxSecurityToken(); + void setXSecurityToken(const std::string& value); + /// /// 资源共享实例的ID。 /// @@ -59,6 +68,8 @@ class HUAWEICLOUD_RAM_V1_EXPORT UpdateResourceShareRequest protected: + std::string xSecurityToken_; + bool xSecurityTokenIsSet_; std::string resourceShareId_; bool resourceShareIdIsSet_; UpdateResourceShareReqBody body_; diff --git a/ram/src/v1/RamClient.cpp b/ram/src/v1/RamClient.cpp index d04544143..d508d94df 100644 --- a/ram/src/v1/RamClient.cpp +++ b/ram/src/v1/RamClient.cpp @@ -49,6 +49,9 @@ std::shared_ptr RamClient::associateRe std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -91,6 +94,9 @@ std::shared_ptr RamClient::disassoc std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -142,6 +148,9 @@ std::shared_ptr RamClient::listResourceSha if (request.markerIsSet()) { localVarQueryParams["marker"] = parameterToString(request.getMarker()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -171,6 +180,9 @@ std::shared_ptr RamClient::listQuota(ListQuotaRequest &reques std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -206,6 +218,9 @@ std::shared_ptr RamClient::listResourceTypes(ListReso if (request.markerIsSet()) { localVarQueryParams["marker"] = parameterToString(request.getMarker()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -235,6 +250,9 @@ std::shared_ptr RamClient::disableOrganization std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -264,6 +282,9 @@ std::shared_ptr RamClient::enableOrganizationSh std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -293,6 +314,9 @@ std::shared_ptr RamClient::showOrganizationShare( std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -329,6 +353,9 @@ std::shared_ptr RamClient::listPermissionVersion if (request.markerIsSet()) { localVarQueryParams["marker"] = parameterToString(request.getMarker()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -370,6 +397,9 @@ std::shared_ptr RamClient::listPermissions(ListPermissi if (request.permissionTypeIsSet()) { localVarQueryParams["permission_type"] = parameterToString(request.getPermissionType()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -403,6 +433,9 @@ std::shared_ptr RamClient::showPermission(ShowPermission if (request.permissionVersionIsSet()) { localVarQueryParams["permission_version"] = parameterToString(request.getPermissionVersion()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -432,6 +465,9 @@ std::shared_ptr RamClient::searchSharedPrincipal std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -473,6 +509,9 @@ std::shared_ptr RamClient::searchSharedResources( std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -514,6 +553,9 @@ std::shared_ptr RamClient::createResourceShare(Crea std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -556,6 +598,9 @@ std::shared_ptr RamClient::deleteResourceShare(Dele std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -585,6 +630,9 @@ std::shared_ptr RamClient::searchResourceShares(Se std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -627,6 +675,9 @@ std::shared_ptr RamClient::updateResourceShare(Upda std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -669,6 +720,9 @@ std::shared_ptr RamClient::associateResourceShar std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -711,6 +765,9 @@ std::shared_ptr RamClient::disassociateResour std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -752,6 +809,9 @@ std::shared_ptr RamClient::searchResour std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -794,6 +854,9 @@ std::shared_ptr RamClient::acceptResource std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -824,6 +887,9 @@ std::shared_ptr RamClient::rejectResource std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -853,6 +919,9 @@ std::shared_ptr RamClient::searchResource std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -895,6 +964,9 @@ std::shared_ptr RamClient::batchCreateReso std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -937,6 +1009,9 @@ std::shared_ptr RamClient::batchDeleteReso std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -984,6 +1059,9 @@ std::shared_ptr RamClient::listResourceShareTags( if (request.markerIsSet()) { localVarQueryParams["marker"] = parameterToString(request.getMarker()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; @@ -1019,6 +1097,9 @@ std::shared_ptr RamClient::listResourceSharesB if (request.offsetIsSet()) { localVarQueryParams["offset"] = parameterToString(request.getOffset()); } + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { @@ -1060,6 +1141,9 @@ std::shared_ptr RamClient::searchResourc std::string contentType = getContentType("application/json", isJson, isMultiPart, isBson); localVarHeaderParams["Content-Type"] = contentType; + if (request.xSecurityTokenIsSet()) { + localVarHeaderParams["X-Security-Token"] = parameterToString(request.getXSecurityToken()); + } std::string localVarHttpBody; if (isJson) { diff --git a/ram/src/v1/RamMeta.cpp b/ram/src/v1/RamMeta.cpp index 57c85bef8..086341f02 100644 --- a/ram/src/v1/RamMeta.cpp +++ b/ram/src/v1/RamMeta.cpp @@ -10,6 +10,11 @@ using namespace HuaweiCloud::Sdk::Core::Http; HttpRequestDef RamMeta::genRequestDefForAssociateResourceSharePermission() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -19,6 +24,11 @@ HttpRequestDef RamMeta::genRequestDefForAssociateResourceSharePermission() { HttpRequestDef RamMeta::genRequestDefForDisassociateResourceSharePermission() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -37,11 +47,21 @@ HttpRequestDef RamMeta::genRequestDefForListResourceSharePermissions() { reqDefBuilder.withRequestField(FieldDef().withName("Marker") .withJsonTag("marker") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForListQuota() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } @@ -53,21 +73,41 @@ HttpRequestDef RamMeta::genRequestDefForListResourceTypes() { reqDefBuilder.withRequestField(FieldDef().withName("Marker") .withJsonTag("marker") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForDisableOrganizationShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForEnableOrganizationShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForShowOrganizationShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } @@ -79,6 +119,11 @@ HttpRequestDef RamMeta::genRequestDefForListPermissionVersions() { reqDefBuilder.withRequestField(FieldDef().withName("Marker") .withJsonTag("marker") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } @@ -96,6 +141,11 @@ HttpRequestDef RamMeta::genRequestDefForListPermissions() { reqDefBuilder.withRequestField(FieldDef().withName("PermissionType") .withJsonTag("permission_type") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } @@ -104,11 +154,21 @@ HttpRequestDef RamMeta::genRequestDefForShowPermission() { reqDefBuilder.withRequestField(FieldDef().withName("PermissionVersion") .withJsonTag("permission_version") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForSearchSharedPrincipals() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -118,6 +178,11 @@ HttpRequestDef RamMeta::genRequestDefForSearchSharedPrincipals() { HttpRequestDef RamMeta::genRequestDefForSearchSharedResources() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -127,6 +192,11 @@ HttpRequestDef RamMeta::genRequestDefForSearchSharedResources() { HttpRequestDef RamMeta::genRequestDefForCreateResourceShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -136,11 +206,21 @@ HttpRequestDef RamMeta::genRequestDefForCreateResourceShare() { HttpRequestDef RamMeta::genRequestDefForDeleteResourceShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForSearchResourceShares() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -150,6 +230,11 @@ HttpRequestDef RamMeta::genRequestDefForSearchResourceShares() { HttpRequestDef RamMeta::genRequestDefForUpdateResourceShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -159,6 +244,11 @@ HttpRequestDef RamMeta::genRequestDefForUpdateResourceShare() { HttpRequestDef RamMeta::genRequestDefForAssociateResourceShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -168,6 +258,11 @@ HttpRequestDef RamMeta::genRequestDefForAssociateResourceShare() { HttpRequestDef RamMeta::genRequestDefForDisassociateResourceShare() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -177,6 +272,11 @@ HttpRequestDef RamMeta::genRequestDefForDisassociateResourceShare() { HttpRequestDef RamMeta::genRequestDefForSearchResourceShareAssociations() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -186,16 +286,31 @@ HttpRequestDef RamMeta::genRequestDefForSearchResourceShareAssociations() { HttpRequestDef RamMeta::genRequestDefForAcceptResourceShareInvitation() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForRejectResourceShareInvitation() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } HttpRequestDef RamMeta::genRequestDefForSearchResourceShareInvitation() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -205,6 +320,11 @@ HttpRequestDef RamMeta::genRequestDefForSearchResourceShareInvitation() { HttpRequestDef RamMeta::genRequestDefForBatchCreateResourceShareTags() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -214,6 +334,11 @@ HttpRequestDef RamMeta::genRequestDefForBatchCreateResourceShareTags() { HttpRequestDef RamMeta::genRequestDefForBatchDeleteResourceShareTags() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -229,6 +354,11 @@ HttpRequestDef RamMeta::genRequestDefForListResourceShareTags() { reqDefBuilder.withRequestField(FieldDef().withName("Marker") .withJsonTag("marker") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); return reqDefBuilder; } @@ -240,6 +370,11 @@ HttpRequestDef RamMeta::genRequestDefForListResourceSharesByTags() { reqDefBuilder.withRequestField(FieldDef().withName("Offset") .withJsonTag("offset") .withLocationType(Query_)); + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). @@ -249,6 +384,11 @@ HttpRequestDef RamMeta::genRequestDefForListResourceSharesByTags() { HttpRequestDef RamMeta::genRequestDefForSearchResourceShareCountByTags() { HttpRequestDef reqDefBuilder; + FieldDef headerParamXSecurityToken; + reqDefBuilder.withRequestField(headerParamXSecurityToken + .withName("XSecurityToken") + .withJsonTag("X-Security-Token") + .withLocationType(Header_)); FieldDef bodyParam; reqDefBuilder.withRequestField(bodyParam. withName("Body"). diff --git a/ram/src/v1/model/AcceptResourceShareInvitationRequest.cpp b/ram/src/v1/model/AcceptResourceShareInvitationRequest.cpp index 4b4c712ad..55e7d5cea 100644 --- a/ram/src/v1/model/AcceptResourceShareInvitationRequest.cpp +++ b/ram/src/v1/model/AcceptResourceShareInvitationRequest.cpp @@ -12,6 +12,8 @@ namespace Model { AcceptResourceShareInvitationRequest::AcceptResourceShareInvitationRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareInvitationId_ = ""; resourceShareInvitationIdIsSet_ = false; } @@ -26,6 +28,9 @@ web::json::value AcceptResourceShareInvitationRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareInvitationIdIsSet_) { val[utility::conversions::to_string_t("resource_share_invitation_id")] = ModelBase::toJson(resourceShareInvitationId_); } @@ -36,6 +41,15 @@ bool AcceptResourceShareInvitationRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_invitation_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_invitation_id")); if(!fieldValue.is_null()) @@ -49,6 +63,27 @@ bool AcceptResourceShareInvitationRequest::fromJson(const web::json::value& val) } +std::string AcceptResourceShareInvitationRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void AcceptResourceShareInvitationRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool AcceptResourceShareInvitationRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void AcceptResourceShareInvitationRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string AcceptResourceShareInvitationRequest::getResourceShareInvitationId() const { return resourceShareInvitationId_; diff --git a/ram/src/v1/model/AssociateResourceSharePermissionRequest.cpp b/ram/src/v1/model/AssociateResourceSharePermissionRequest.cpp index e5c2392e9..075c34267 100644 --- a/ram/src/v1/model/AssociateResourceSharePermissionRequest.cpp +++ b/ram/src/v1/model/AssociateResourceSharePermissionRequest.cpp @@ -12,6 +12,8 @@ namespace Model { AssociateResourceSharePermissionRequest::AssociateResourceSharePermissionRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; bodyIsSet_ = false; @@ -27,6 +29,9 @@ web::json::value AssociateResourceSharePermissionRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -40,6 +45,15 @@ bool AssociateResourceSharePermissionRequest::fromJson(const web::json::value& v { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -62,6 +76,27 @@ bool AssociateResourceSharePermissionRequest::fromJson(const web::json::value& v } +std::string AssociateResourceSharePermissionRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void AssociateResourceSharePermissionRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool AssociateResourceSharePermissionRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void AssociateResourceSharePermissionRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string AssociateResourceSharePermissionRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/AssociateResourceShareRequest.cpp b/ram/src/v1/model/AssociateResourceShareRequest.cpp index 49117184a..e25ca531c 100644 --- a/ram/src/v1/model/AssociateResourceShareRequest.cpp +++ b/ram/src/v1/model/AssociateResourceShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { AssociateResourceShareRequest::AssociateResourceShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; bodyIsSet_ = false; @@ -27,6 +29,9 @@ web::json::value AssociateResourceShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -40,6 +45,15 @@ bool AssociateResourceShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -62,6 +76,27 @@ bool AssociateResourceShareRequest::fromJson(const web::json::value& val) } +std::string AssociateResourceShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void AssociateResourceShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool AssociateResourceShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void AssociateResourceShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string AssociateResourceShareRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/BatchCreateResourceShareTagsRequest.cpp b/ram/src/v1/model/BatchCreateResourceShareTagsRequest.cpp index 312137b8c..ef1b618a1 100644 --- a/ram/src/v1/model/BatchCreateResourceShareTagsRequest.cpp +++ b/ram/src/v1/model/BatchCreateResourceShareTagsRequest.cpp @@ -14,6 +14,8 @@ BatchCreateResourceShareTagsRequest::BatchCreateResourceShareTagsRequest() { resourceShareId_ = ""; resourceShareIdIsSet_ = false; + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -30,6 +32,9 @@ web::json::value BatchCreateResourceShareTagsRequest::toJson() const if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -49,6 +54,15 @@ bool BatchCreateResourceShareTagsRequest::fromJson(const web::json::value& val) setResourceShareId(refVal); } } + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -83,6 +97,27 @@ void BatchCreateResourceShareTagsRequest::unsetresourceShareId() resourceShareIdIsSet_ = false; } +std::string BatchCreateResourceShareTagsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void BatchCreateResourceShareTagsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool BatchCreateResourceShareTagsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void BatchCreateResourceShareTagsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + TagResourceReqBody BatchCreateResourceShareTagsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/BatchDeleteResourceShareTagsRequest.cpp b/ram/src/v1/model/BatchDeleteResourceShareTagsRequest.cpp index ea83d6b6d..59abd3e09 100644 --- a/ram/src/v1/model/BatchDeleteResourceShareTagsRequest.cpp +++ b/ram/src/v1/model/BatchDeleteResourceShareTagsRequest.cpp @@ -14,6 +14,8 @@ BatchDeleteResourceShareTagsRequest::BatchDeleteResourceShareTagsRequest() { resourceShareId_ = ""; resourceShareIdIsSet_ = false; + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -30,6 +32,9 @@ web::json::value BatchDeleteResourceShareTagsRequest::toJson() const if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -49,6 +54,15 @@ bool BatchDeleteResourceShareTagsRequest::fromJson(const web::json::value& val) setResourceShareId(refVal); } } + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -83,6 +97,27 @@ void BatchDeleteResourceShareTagsRequest::unsetresourceShareId() resourceShareIdIsSet_ = false; } +std::string BatchDeleteResourceShareTagsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void BatchDeleteResourceShareTagsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool BatchDeleteResourceShareTagsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void BatchDeleteResourceShareTagsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + UntagResourceReqBody BatchDeleteResourceShareTagsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/CreateResourceShareRequest.cpp b/ram/src/v1/model/CreateResourceShareRequest.cpp index 979785e0a..55144d401 100644 --- a/ram/src/v1/model/CreateResourceShareRequest.cpp +++ b/ram/src/v1/model/CreateResourceShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { CreateResourceShareRequest::CreateResourceShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value CreateResourceShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool CreateResourceShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool CreateResourceShareRequest::fromJson(const web::json::value& val) } +std::string CreateResourceShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void CreateResourceShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool CreateResourceShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void CreateResourceShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + CreateResourceShareReqBody CreateResourceShareRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/DeleteResourceShareRequest.cpp b/ram/src/v1/model/DeleteResourceShareRequest.cpp index 276b371ff..842601aa4 100644 --- a/ram/src/v1/model/DeleteResourceShareRequest.cpp +++ b/ram/src/v1/model/DeleteResourceShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { DeleteResourceShareRequest::DeleteResourceShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; } @@ -26,6 +28,9 @@ web::json::value DeleteResourceShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -36,6 +41,15 @@ bool DeleteResourceShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -49,6 +63,27 @@ bool DeleteResourceShareRequest::fromJson(const web::json::value& val) } +std::string DeleteResourceShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void DeleteResourceShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool DeleteResourceShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void DeleteResourceShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string DeleteResourceShareRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/DisableOrganizationShareRequest.cpp b/ram/src/v1/model/DisableOrganizationShareRequest.cpp index ea5d11a66..2b1064f67 100644 --- a/ram/src/v1/model/DisableOrganizationShareRequest.cpp +++ b/ram/src/v1/model/DisableOrganizationShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { DisableOrganizationShareRequest::DisableOrganizationShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; } DisableOrganizationShareRequest::~DisableOrganizationShareRequest() = default; @@ -24,6 +26,9 @@ web::json::value DisableOrganizationShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } return val; } @@ -31,10 +36,40 @@ bool DisableOrganizationShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } return ok; } +std::string DisableOrganizationShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void DisableOrganizationShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool DisableOrganizationShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void DisableOrganizationShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + } } } diff --git a/ram/src/v1/model/DisassociateResourceSharePermissionRequest.cpp b/ram/src/v1/model/DisassociateResourceSharePermissionRequest.cpp index df8283c51..05c07dc7e 100644 --- a/ram/src/v1/model/DisassociateResourceSharePermissionRequest.cpp +++ b/ram/src/v1/model/DisassociateResourceSharePermissionRequest.cpp @@ -12,6 +12,8 @@ namespace Model { DisassociateResourceSharePermissionRequest::DisassociateResourceSharePermissionRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; bodyIsSet_ = false; @@ -27,6 +29,9 @@ web::json::value DisassociateResourceSharePermissionRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -40,6 +45,15 @@ bool DisassociateResourceSharePermissionRequest::fromJson(const web::json::value { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -62,6 +76,27 @@ bool DisassociateResourceSharePermissionRequest::fromJson(const web::json::value } +std::string DisassociateResourceSharePermissionRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void DisassociateResourceSharePermissionRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool DisassociateResourceSharePermissionRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void DisassociateResourceSharePermissionRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string DisassociateResourceSharePermissionRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/DisassociateResourceShareRequest.cpp b/ram/src/v1/model/DisassociateResourceShareRequest.cpp index 84282fecd..5ed1ca9fb 100644 --- a/ram/src/v1/model/DisassociateResourceShareRequest.cpp +++ b/ram/src/v1/model/DisassociateResourceShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { DisassociateResourceShareRequest::DisassociateResourceShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; bodyIsSet_ = false; @@ -27,6 +29,9 @@ web::json::value DisassociateResourceShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -40,6 +45,15 @@ bool DisassociateResourceShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -62,6 +76,27 @@ bool DisassociateResourceShareRequest::fromJson(const web::json::value& val) } +std::string DisassociateResourceShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void DisassociateResourceShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool DisassociateResourceShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void DisassociateResourceShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string DisassociateResourceShareRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/EnableOrganizationShareRequest.cpp b/ram/src/v1/model/EnableOrganizationShareRequest.cpp index 1e2089a87..fc66e702e 100644 --- a/ram/src/v1/model/EnableOrganizationShareRequest.cpp +++ b/ram/src/v1/model/EnableOrganizationShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { EnableOrganizationShareRequest::EnableOrganizationShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; } EnableOrganizationShareRequest::~EnableOrganizationShareRequest() = default; @@ -24,6 +26,9 @@ web::json::value EnableOrganizationShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } return val; } @@ -31,10 +36,40 @@ bool EnableOrganizationShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } return ok; } +std::string EnableOrganizationShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void EnableOrganizationShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool EnableOrganizationShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void EnableOrganizationShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + } } } diff --git a/ram/src/v1/model/ListPermissionVersionsRequest.cpp b/ram/src/v1/model/ListPermissionVersionsRequest.cpp index fef5b9044..c716bc7b1 100644 --- a/ram/src/v1/model/ListPermissionVersionsRequest.cpp +++ b/ram/src/v1/model/ListPermissionVersionsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ListPermissionVersionsRequest::ListPermissionVersionsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; limit_ = 0; limitIsSet_ = false; marker_ = ""; @@ -30,6 +32,9 @@ web::json::value ListPermissionVersionsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(limitIsSet_) { val[utility::conversions::to_string_t("limit")] = ModelBase::toJson(limit_); } @@ -46,6 +51,15 @@ bool ListPermissionVersionsRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("limit"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("limit")); if(!fieldValue.is_null()) @@ -77,6 +91,27 @@ bool ListPermissionVersionsRequest::fromJson(const web::json::value& val) } +std::string ListPermissionVersionsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListPermissionVersionsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListPermissionVersionsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListPermissionVersionsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + int32_t ListPermissionVersionsRequest::getLimit() const { return limit_; diff --git a/ram/src/v1/model/ListPermissionsRequest.cpp b/ram/src/v1/model/ListPermissionsRequest.cpp index 4e486d7aa..48b6e5f89 100644 --- a/ram/src/v1/model/ListPermissionsRequest.cpp +++ b/ram/src/v1/model/ListPermissionsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ListPermissionsRequest::ListPermissionsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; limit_ = 0; limitIsSet_ = false; marker_ = ""; @@ -32,6 +34,9 @@ web::json::value ListPermissionsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(limitIsSet_) { val[utility::conversions::to_string_t("limit")] = ModelBase::toJson(limit_); } @@ -51,6 +56,15 @@ bool ListPermissionsRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("limit"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("limit")); if(!fieldValue.is_null()) @@ -91,6 +105,27 @@ bool ListPermissionsRequest::fromJson(const web::json::value& val) } +std::string ListPermissionsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListPermissionsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListPermissionsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListPermissionsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + int32_t ListPermissionsRequest::getLimit() const { return limit_; diff --git a/ram/src/v1/model/ListQuotaRequest.cpp b/ram/src/v1/model/ListQuotaRequest.cpp index 9c5de2be2..8ab575d8f 100644 --- a/ram/src/v1/model/ListQuotaRequest.cpp +++ b/ram/src/v1/model/ListQuotaRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ListQuotaRequest::ListQuotaRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; } ListQuotaRequest::~ListQuotaRequest() = default; @@ -24,6 +26,9 @@ web::json::value ListQuotaRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } return val; } @@ -31,10 +36,40 @@ bool ListQuotaRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } return ok; } +std::string ListQuotaRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListQuotaRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListQuotaRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListQuotaRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + } } } diff --git a/ram/src/v1/model/ListResourceSharePermissionsRequest.cpp b/ram/src/v1/model/ListResourceSharePermissionsRequest.cpp index 897b3f603..93cc8b714 100644 --- a/ram/src/v1/model/ListResourceSharePermissionsRequest.cpp +++ b/ram/src/v1/model/ListResourceSharePermissionsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ListResourceSharePermissionsRequest::ListResourceSharePermissionsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; permissionName_ = ""; @@ -32,6 +34,9 @@ web::json::value ListResourceSharePermissionsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -51,6 +56,15 @@ bool ListResourceSharePermissionsRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -91,6 +105,27 @@ bool ListResourceSharePermissionsRequest::fromJson(const web::json::value& val) } +std::string ListResourceSharePermissionsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListResourceSharePermissionsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListResourceSharePermissionsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListResourceSharePermissionsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string ListResourceSharePermissionsRequest::getResourceShareId() const { return resourceShareId_; diff --git a/ram/src/v1/model/ListResourceShareTagsRequest.cpp b/ram/src/v1/model/ListResourceShareTagsRequest.cpp index 3f8e50b7d..741b82692 100644 --- a/ram/src/v1/model/ListResourceShareTagsRequest.cpp +++ b/ram/src/v1/model/ListResourceShareTagsRequest.cpp @@ -16,6 +16,8 @@ ListResourceShareTagsRequest::ListResourceShareTagsRequest() limitIsSet_ = false; marker_ = ""; markerIsSet_ = false; + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; } ListResourceShareTagsRequest::~ListResourceShareTagsRequest() = default; @@ -34,6 +36,9 @@ web::json::value ListResourceShareTagsRequest::toJson() const if(markerIsSet_) { val[utility::conversions::to_string_t("marker")] = ModelBase::toJson(marker_); } + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } return val; } @@ -59,6 +64,15 @@ bool ListResourceShareTagsRequest::fromJson(const web::json::value& val) setMarker(refVal); } } + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } return ok; } @@ -105,6 +119,27 @@ void ListResourceShareTagsRequest::unsetmarker() markerIsSet_ = false; } +std::string ListResourceShareTagsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListResourceShareTagsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListResourceShareTagsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListResourceShareTagsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + } } } diff --git a/ram/src/v1/model/ListResourceSharesByTagsRequest.cpp b/ram/src/v1/model/ListResourceSharesByTagsRequest.cpp index 171d6cd5f..5be25fc55 100644 --- a/ram/src/v1/model/ListResourceSharesByTagsRequest.cpp +++ b/ram/src/v1/model/ListResourceSharesByTagsRequest.cpp @@ -16,6 +16,8 @@ ListResourceSharesByTagsRequest::ListResourceSharesByTagsRequest() limitIsSet_ = false; offset_ = ""; offsetIsSet_ = false; + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -35,6 +37,9 @@ web::json::value ListResourceSharesByTagsRequest::toJson() const if(offsetIsSet_) { val[utility::conversions::to_string_t("offset")] = ModelBase::toJson(offset_); } + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -63,6 +68,15 @@ bool ListResourceSharesByTagsRequest::fromJson(const web::json::value& val) setOffset(refVal); } } + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -118,6 +132,27 @@ void ListResourceSharesByTagsRequest::unsetoffset() offsetIsSet_ = false; } +std::string ListResourceSharesByTagsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListResourceSharesByTagsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListResourceSharesByTagsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListResourceSharesByTagsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + ResourceSharesByTagsReqBody ListResourceSharesByTagsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/ListResourceTypesRequest.cpp b/ram/src/v1/model/ListResourceTypesRequest.cpp index fb825cfab..c66d0a8f6 100644 --- a/ram/src/v1/model/ListResourceTypesRequest.cpp +++ b/ram/src/v1/model/ListResourceTypesRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ListResourceTypesRequest::ListResourceTypesRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; limit_ = 0; limitIsSet_ = false; marker_ = ""; @@ -28,6 +30,9 @@ web::json::value ListResourceTypesRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(limitIsSet_) { val[utility::conversions::to_string_t("limit")] = ModelBase::toJson(limit_); } @@ -41,6 +46,15 @@ bool ListResourceTypesRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("limit"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("limit")); if(!fieldValue.is_null()) @@ -63,6 +77,27 @@ bool ListResourceTypesRequest::fromJson(const web::json::value& val) } +std::string ListResourceTypesRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ListResourceTypesRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ListResourceTypesRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ListResourceTypesRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + int32_t ListResourceTypesRequest::getLimit() const { return limit_; diff --git a/ram/src/v1/model/RejectResourceShareInvitationRequest.cpp b/ram/src/v1/model/RejectResourceShareInvitationRequest.cpp index e7462a6f1..8fed73949 100644 --- a/ram/src/v1/model/RejectResourceShareInvitationRequest.cpp +++ b/ram/src/v1/model/RejectResourceShareInvitationRequest.cpp @@ -12,6 +12,8 @@ namespace Model { RejectResourceShareInvitationRequest::RejectResourceShareInvitationRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareInvitationId_ = ""; resourceShareInvitationIdIsSet_ = false; } @@ -26,6 +28,9 @@ web::json::value RejectResourceShareInvitationRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareInvitationIdIsSet_) { val[utility::conversions::to_string_t("resource_share_invitation_id")] = ModelBase::toJson(resourceShareInvitationId_); } @@ -36,6 +41,15 @@ bool RejectResourceShareInvitationRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_invitation_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_invitation_id")); if(!fieldValue.is_null()) @@ -49,6 +63,27 @@ bool RejectResourceShareInvitationRequest::fromJson(const web::json::value& val) } +std::string RejectResourceShareInvitationRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void RejectResourceShareInvitationRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool RejectResourceShareInvitationRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void RejectResourceShareInvitationRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string RejectResourceShareInvitationRequest::getResourceShareInvitationId() const { return resourceShareInvitationId_; diff --git a/ram/src/v1/model/SearchResourceShareAssociationsRequest.cpp b/ram/src/v1/model/SearchResourceShareAssociationsRequest.cpp index 5fb12080a..2be2aa848 100644 --- a/ram/src/v1/model/SearchResourceShareAssociationsRequest.cpp +++ b/ram/src/v1/model/SearchResourceShareAssociationsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchResourceShareAssociationsRequest::SearchResourceShareAssociationsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchResourceShareAssociationsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchResourceShareAssociationsRequest::fromJson(const web::json::value& va { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchResourceShareAssociationsRequest::fromJson(const web::json::value& va } +std::string SearchResourceShareAssociationsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchResourceShareAssociationsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchResourceShareAssociationsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchResourceShareAssociationsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + SearchResourceShareAssociationsReqBody SearchResourceShareAssociationsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/SearchResourceShareCountByTagsRequest.cpp b/ram/src/v1/model/SearchResourceShareCountByTagsRequest.cpp index 409b3be45..32d780b66 100644 --- a/ram/src/v1/model/SearchResourceShareCountByTagsRequest.cpp +++ b/ram/src/v1/model/SearchResourceShareCountByTagsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchResourceShareCountByTagsRequest::SearchResourceShareCountByTagsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchResourceShareCountByTagsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchResourceShareCountByTagsRequest::fromJson(const web::json::value& val { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchResourceShareCountByTagsRequest::fromJson(const web::json::value& val } +std::string SearchResourceShareCountByTagsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchResourceShareCountByTagsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchResourceShareCountByTagsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchResourceShareCountByTagsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + ResourceSharesByTagsReqBody SearchResourceShareCountByTagsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/SearchResourceShareInvitationRequest.cpp b/ram/src/v1/model/SearchResourceShareInvitationRequest.cpp index 4cd1bd000..b4e82996c 100644 --- a/ram/src/v1/model/SearchResourceShareInvitationRequest.cpp +++ b/ram/src/v1/model/SearchResourceShareInvitationRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchResourceShareInvitationRequest::SearchResourceShareInvitationRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchResourceShareInvitationRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchResourceShareInvitationRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchResourceShareInvitationRequest::fromJson(const web::json::value& val) } +std::string SearchResourceShareInvitationRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchResourceShareInvitationRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchResourceShareInvitationRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchResourceShareInvitationRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + SearchResourceShareInvitationReqBody SearchResourceShareInvitationRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/SearchResourceSharesRequest.cpp b/ram/src/v1/model/SearchResourceSharesRequest.cpp index f29d55605..e485aac69 100644 --- a/ram/src/v1/model/SearchResourceSharesRequest.cpp +++ b/ram/src/v1/model/SearchResourceSharesRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchResourceSharesRequest::SearchResourceSharesRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchResourceSharesRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchResourceSharesRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchResourceSharesRequest::fromJson(const web::json::value& val) } +std::string SearchResourceSharesRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchResourceSharesRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchResourceSharesRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchResourceSharesRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + SearchResourceSharesReqBody SearchResourceSharesRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/SearchSharedPrincipalsRequest.cpp b/ram/src/v1/model/SearchSharedPrincipalsRequest.cpp index 93e049538..ec0f0624e 100644 --- a/ram/src/v1/model/SearchSharedPrincipalsRequest.cpp +++ b/ram/src/v1/model/SearchSharedPrincipalsRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchSharedPrincipalsRequest::SearchSharedPrincipalsRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchSharedPrincipalsRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchSharedPrincipalsRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchSharedPrincipalsRequest::fromJson(const web::json::value& val) } +std::string SearchSharedPrincipalsRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchSharedPrincipalsRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchSharedPrincipalsRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchSharedPrincipalsRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + SearchSharedPrincipalsReqBody SearchSharedPrincipalsRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/SearchSharedResourcesRequest.cpp b/ram/src/v1/model/SearchSharedResourcesRequest.cpp index 6325c0273..81467fdf3 100644 --- a/ram/src/v1/model/SearchSharedResourcesRequest.cpp +++ b/ram/src/v1/model/SearchSharedResourcesRequest.cpp @@ -12,6 +12,8 @@ namespace Model { SearchSharedResourcesRequest::SearchSharedResourcesRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; bodyIsSet_ = false; } @@ -25,6 +27,9 @@ web::json::value SearchSharedResourcesRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(bodyIsSet_) { val[utility::conversions::to_string_t("body")] = ModelBase::toJson(body_); } @@ -35,6 +40,15 @@ bool SearchSharedResourcesRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("body"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("body")); if(!fieldValue.is_null()) @@ -48,6 +62,27 @@ bool SearchSharedResourcesRequest::fromJson(const web::json::value& val) } +std::string SearchSharedResourcesRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void SearchSharedResourcesRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool SearchSharedResourcesRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void SearchSharedResourcesRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + SearchSharedResourcesReqBody SearchSharedResourcesRequest::getBody() const { return body_; diff --git a/ram/src/v1/model/ShowOrganizationShareRequest.cpp b/ram/src/v1/model/ShowOrganizationShareRequest.cpp index 38a9d37a8..c304027dc 100644 --- a/ram/src/v1/model/ShowOrganizationShareRequest.cpp +++ b/ram/src/v1/model/ShowOrganizationShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { ShowOrganizationShareRequest::ShowOrganizationShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; } ShowOrganizationShareRequest::~ShowOrganizationShareRequest() = default; @@ -24,6 +26,9 @@ web::json::value ShowOrganizationShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } return val; } @@ -31,10 +36,40 @@ bool ShowOrganizationShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } return ok; } +std::string ShowOrganizationShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ShowOrganizationShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ShowOrganizationShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ShowOrganizationShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + } } } diff --git a/ram/src/v1/model/ShowPermissionRequest.cpp b/ram/src/v1/model/ShowPermissionRequest.cpp index cdad937a6..deca2cd90 100644 --- a/ram/src/v1/model/ShowPermissionRequest.cpp +++ b/ram/src/v1/model/ShowPermissionRequest.cpp @@ -14,6 +14,8 @@ ShowPermissionRequest::ShowPermissionRequest() { permissionId_ = ""; permissionIdIsSet_ = false; + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; permissionVersion_ = 0; permissionVersionIsSet_ = false; } @@ -31,6 +33,9 @@ web::json::value ShowPermissionRequest::toJson() const if(permissionIdIsSet_) { val[utility::conversions::to_string_t("permission_id")] = ModelBase::toJson(permissionId_); } + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(permissionVersionIsSet_) { val[utility::conversions::to_string_t("permission_version")] = ModelBase::toJson(permissionVersion_); } @@ -50,6 +55,15 @@ bool ShowPermissionRequest::fromJson(const web::json::value& val) setPermissionId(refVal); } } + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("permission_version"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("permission_version")); if(!fieldValue.is_null()) @@ -84,6 +98,27 @@ void ShowPermissionRequest::unsetpermissionId() permissionIdIsSet_ = false; } +std::string ShowPermissionRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void ShowPermissionRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool ShowPermissionRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void ShowPermissionRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + int32_t ShowPermissionRequest::getPermissionVersion() const { return permissionVersion_; diff --git a/ram/src/v1/model/UpdateResourceShareRequest.cpp b/ram/src/v1/model/UpdateResourceShareRequest.cpp index f9654200d..309d87844 100644 --- a/ram/src/v1/model/UpdateResourceShareRequest.cpp +++ b/ram/src/v1/model/UpdateResourceShareRequest.cpp @@ -12,6 +12,8 @@ namespace Model { UpdateResourceShareRequest::UpdateResourceShareRequest() { + xSecurityToken_ = ""; + xSecurityTokenIsSet_ = false; resourceShareId_ = ""; resourceShareIdIsSet_ = false; bodyIsSet_ = false; @@ -27,6 +29,9 @@ web::json::value UpdateResourceShareRequest::toJson() const { web::json::value val = web::json::value::object(); + if(xSecurityTokenIsSet_) { + val[utility::conversions::to_string_t("X-Security-Token")] = ModelBase::toJson(xSecurityToken_); + } if(resourceShareIdIsSet_) { val[utility::conversions::to_string_t("resource_share_id")] = ModelBase::toJson(resourceShareId_); } @@ -40,6 +45,15 @@ bool UpdateResourceShareRequest::fromJson(const web::json::value& val) { bool ok = true; + if(val.has_field(utility::conversions::to_string_t("X-Security-Token"))) { + const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("X-Security-Token")); + if(!fieldValue.is_null()) + { + std::string refVal; + ok &= ModelBase::fromJson(fieldValue, refVal); + setXSecurityToken(refVal); + } + } if(val.has_field(utility::conversions::to_string_t("resource_share_id"))) { const web::json::value& fieldValue = val.at(utility::conversions::to_string_t("resource_share_id")); if(!fieldValue.is_null()) @@ -62,6 +76,27 @@ bool UpdateResourceShareRequest::fromJson(const web::json::value& val) } +std::string UpdateResourceShareRequest::getXSecurityToken() const +{ + return xSecurityToken_; +} + +void UpdateResourceShareRequest::setXSecurityToken(const std::string& value) +{ + xSecurityToken_ = value; + xSecurityTokenIsSet_ = true; +} + +bool UpdateResourceShareRequest::xSecurityTokenIsSet() const +{ + return xSecurityTokenIsSet_; +} + +void UpdateResourceShareRequest::unsetxSecurityToken() +{ + xSecurityTokenIsSet_ = false; +} + std::string UpdateResourceShareRequest::getResourceShareId() const { return resourceShareId_; diff --git a/rds/include/huaweicloud/rds/v3/model/UserForCreation.h b/rds/include/huaweicloud/rds/v3/model/UserForCreation.h index d88413b4d..de2945c0a 100644 --- a/rds/include/huaweicloud/rds/v3/model/UserForCreation.h +++ b/rds/include/huaweicloud/rds/v3/model/UserForCreation.h @@ -68,7 +68,7 @@ class HUAWEICLOUD_RDS_V3_EXPORT UserForCreation void setComment(const std::string& value); /// - /// 是否创建高权限用户。 • 若为true，则不用传hosts、databases参数。 + /// 是否创建高权限用户。 • 默认为false，暂不支持设置为true /// bool isIsPrivilege() const;