waldur-api-client 7.7.9__py3-none-any.whl → 7.8.0__py3-none-any.whl

waldur_api_client/models/identity_provider.py

@@ -15,6 +15,7 @@ class IdentityProvider:
     Attributes:
         provider (str):
         client_id (str): ID of application used for OAuth authentication.
+        client_secret (str): Application secret key.
         discovery_url (str): The endpoint for endpoint discovery.
         userinfo_url (str): The endpoint for fetching user info.
         token_url (str): The endpoint for obtaining auth token.
@@ -28,10 +29,17 @@ class IdentityProvider:
         management_url (Union[Unset, str]): The endpoint for user details management.
         protected_fields (Union[Unset, Any]):
         extra_scope (Union[None, Unset, str]): Space-separated list of scopes to request during authentication.
+        user_field (Union[Unset, str]): The field in Waldur User model to be used for looking up the user
+        user_claim (Union[Unset, str]): The OIDC claim from the userinfo endpoint to be used as the value for the lookup
+            field.
+        attribute_mapping (Union[Unset, Any]): A JSON object mapping Waldur User model fields to OIDC claims. Example:
+            {"first_name": "given_name", "last_name": "family_name", "email": "email"}
+        extra_fields (Union[None, Unset, str]): Space-separated list of extra fields to persist.
     """
 
     provider: str
     client_id: str
+    client_secret: str
     discovery_url: str
     userinfo_url: str
     token_url: str
@@ -45,6 +53,10 @@ class IdentityProvider:
     management_url: Union[Unset, str] = UNSET
     protected_fields: Union[Unset, Any] = UNSET
     extra_scope: Union[None, Unset, str] = UNSET
+    user_field: Union[Unset, str] = UNSET
+    user_claim: Union[Unset, str] = UNSET
+    attribute_mapping: Union[Unset, Any] = UNSET
+    extra_fields: Union[None, Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -52,6 +64,8 @@ class IdentityProvider:
 
         client_id = self.client_id
 
+        client_secret = self.client_secret
+
         discovery_url = self.discovery_url
 
         userinfo_url = self.userinfo_url
@@ -82,12 +96,25 @@ class IdentityProvider:
         else:
             extra_scope = self.extra_scope
 
+        user_field = self.user_field
+
+        user_claim = self.user_claim
+
+        attribute_mapping = self.attribute_mapping
+
+        extra_fields: Union[None, Unset, str]
+        if isinstance(self.extra_fields, Unset):
+            extra_fields = UNSET
+        else:
+            extra_fields = self.extra_fields
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "provider": provider,
                 "client_id": client_id,
+                "client_secret": client_secret,
                 "discovery_url": discovery_url,
                 "userinfo_url": userinfo_url,
                 "token_url": token_url,
@@ -110,6 +137,14 @@ class IdentityProvider:
             field_dict["protected_fields"] = protected_fields
         if extra_scope is not UNSET:
             field_dict["extra_scope"] = extra_scope
+        if user_field is not UNSET:
+            field_dict["user_field"] = user_field
+        if user_claim is not UNSET:
+            field_dict["user_claim"] = user_claim
+        if attribute_mapping is not UNSET:
+            field_dict["attribute_mapping"] = attribute_mapping
+        if extra_fields is not UNSET:
+            field_dict["extra_fields"] = extra_fields
 
         return field_dict
 
@@ -120,6 +155,8 @@ class IdentityProvider:
 
         client_id = d.pop("client_id")
 
+        client_secret = d.pop("client_secret")
+
         discovery_url = d.pop("discovery_url")
 
         userinfo_url = d.pop("userinfo_url")
@@ -153,9 +190,25 @@ class IdentityProvider:
 
         extra_scope = _parse_extra_scope(d.pop("extra_scope", UNSET))
 
+        user_field = d.pop("user_field", UNSET)
+
+        user_claim = d.pop("user_claim", UNSET)
+
+        attribute_mapping = d.pop("attribute_mapping", UNSET)
+
+        def _parse_extra_fields(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        extra_fields = _parse_extra_fields(d.pop("extra_fields", UNSET))
+
         identity_provider = cls(
             provider=provider,
             client_id=client_id,
+            client_secret=client_secret,
             discovery_url=discovery_url,
             userinfo_url=userinfo_url,
             token_url=token_url,
@@ -169,6 +222,10 @@ class IdentityProvider:
             management_url=management_url,
             protected_fields=protected_fields,
             extra_scope=extra_scope,
+            user_field=user_field,
+            user_claim=user_claim,
+            attribute_mapping=attribute_mapping,
+            extra_fields=extra_fields,
         )
 
         identity_provider.additional_properties = d

waldur_api_client/models/identity_provider_request.py

@@ -15,6 +15,7 @@ class IdentityProviderRequest:
     Attributes:
         provider (str):
         client_id (str): ID of application used for OAuth authentication.
+        client_secret (str): Application secret key.
         discovery_url (str): The endpoint for endpoint discovery.
         label (str): Human-readable identity provider is label.
         is_active (Union[Unset, bool]):
@@ -24,10 +25,17 @@ class IdentityProviderRequest:
         management_url (Union[Unset, str]): The endpoint for user details management.
         protected_fields (Union[Unset, Any]):
         extra_scope (Union[None, Unset, str]): Space-separated list of scopes to request during authentication.
+        user_field (Union[Unset, str]): The field in Waldur User model to be used for looking up the user
+        user_claim (Union[Unset, str]): The OIDC claim from the userinfo endpoint to be used as the value for the lookup
+            field.
+        attribute_mapping (Union[Unset, Any]): A JSON object mapping Waldur User model fields to OIDC claims. Example:
+            {"first_name": "given_name", "last_name": "family_name", "email": "email"}
+        extra_fields (Union[None, Unset, str]): Space-separated list of extra fields to persist.
     """
 
     provider: str
     client_id: str
+    client_secret: str
     discovery_url: str
     label: str
     is_active: Union[Unset, bool] = UNSET
@@ -37,6 +45,10 @@ class IdentityProviderRequest:
     management_url: Union[Unset, str] = UNSET
     protected_fields: Union[Unset, Any] = UNSET
     extra_scope: Union[None, Unset, str] = UNSET
+    user_field: Union[Unset, str] = UNSET
+    user_claim: Union[Unset, str] = UNSET
+    attribute_mapping: Union[Unset, Any] = UNSET
+    extra_fields: Union[None, Unset, str] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -44,6 +56,8 @@ class IdentityProviderRequest:
 
         client_id = self.client_id
 
+        client_secret = self.client_secret
+
         discovery_url = self.discovery_url
 
         label = self.label
@@ -66,12 +80,25 @@ class IdentityProviderRequest:
         else:
             extra_scope = self.extra_scope
 
+        user_field = self.user_field
+
+        user_claim = self.user_claim
+
+        attribute_mapping = self.attribute_mapping
+
+        extra_fields: Union[None, Unset, str]
+        if isinstance(self.extra_fields, Unset):
+            extra_fields = UNSET
+        else:
+            extra_fields = self.extra_fields
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "provider": provider,
                 "client_id": client_id,
+                "client_secret": client_secret,
                 "discovery_url": discovery_url,
                 "label": label,
             }
@@ -90,6 +117,14 @@ class IdentityProviderRequest:
             field_dict["protected_fields"] = protected_fields
         if extra_scope is not UNSET:
             field_dict["extra_scope"] = extra_scope
+        if user_field is not UNSET:
+            field_dict["user_field"] = user_field
+        if user_claim is not UNSET:
+            field_dict["user_claim"] = user_claim
+        if attribute_mapping is not UNSET:
+            field_dict["attribute_mapping"] = attribute_mapping
+        if extra_fields is not UNSET:
+            field_dict["extra_fields"] = extra_fields
 
         return field_dict
 
@@ -100,6 +135,8 @@ class IdentityProviderRequest:
 
         client_id = d.pop("client_id")
 
+        client_secret = d.pop("client_secret")
+
         discovery_url = d.pop("discovery_url")
 
         label = d.pop("label")
@@ -125,9 +162,25 @@ class IdentityProviderRequest:
 
         extra_scope = _parse_extra_scope(d.pop("extra_scope", UNSET))
 
+        user_field = d.pop("user_field", UNSET)
+
+        user_claim = d.pop("user_claim", UNSET)
+
+        attribute_mapping = d.pop("attribute_mapping", UNSET)
+
+        def _parse_extra_fields(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        extra_fields = _parse_extra_fields(d.pop("extra_fields", UNSET))
+
         identity_provider_request = cls(
             provider=provider,
             client_id=client_id,
+            client_secret=client_secret,
             discovery_url=discovery_url,
             label=label,
             is_active=is_active,
@@ -137,6 +190,10 @@ class IdentityProviderRequest:
             management_url=management_url,
             protected_fields=protected_fields,
             extra_scope=extra_scope,
+            user_field=user_field,
+            user_claim=user_claim,
+            attribute_mapping=attribute_mapping,
+            extra_fields=extra_fields,
         )
 
         identity_provider_request.additional_properties = d

waldur_api_client/models/issue.py

@@ -7,7 +7,6 @@ from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 from dateutil.parser import isoparse
 
-from ..models.issue_type_enum import IssueTypeEnum
 from ..types import UNSET, Unset
 
 if TYPE_CHECKING:
@@ -23,6 +22,7 @@ class Issue:
     Attributes:
         url (str):
         uuid (UUID):
+        type_ (str):
         key (str):
         backend_id (Union[None, str]):
         backend_name (Union[None, str]):
@@ -52,7 +52,6 @@ class Issue:
         destroy_is_available (bool):
         add_comment_is_available (bool):
         add_attachment_is_available (bool):
-        type_ (Union[Unset, IssueTypeEnum]):  Default: IssueTypeEnum.INFORMATIONAL.
         remote_id (Union[None, Unset, str]):
         description (Union[Unset, str]):
         priority (Union[Unset, str]):
@@ -66,6 +65,7 @@ class Issue:
 
     url: str
     uuid: UUID
+    type_: str
     key: str
     backend_id: Union[None, str]
     backend_name: Union[None, str]
@@ -95,7 +95,6 @@ class Issue:
     destroy_is_available: bool
     add_comment_is_available: bool
     add_attachment_is_available: bool
-    type_: Union[Unset, IssueTypeEnum] = IssueTypeEnum.INFORMATIONAL
     remote_id: Union[None, Unset, str] = UNSET
     description: Union[Unset, str] = UNSET
     priority: Union[Unset, str] = UNSET
@@ -114,6 +113,8 @@ class Issue:
 
         uuid = str(self.uuid)
 
+        type_ = self.type_
+
         key = self.key
 
         backend_id: Union[None, str]
@@ -208,10 +209,6 @@ class Issue:
 
         add_attachment_is_available = self.add_attachment_is_available
 
-        type_: Union[Unset, str] = UNSET
-        if not isinstance(self.type_, Unset):
-            type_ = self.type_.value
-
         remote_id: Union[None, Unset, str]
         if isinstance(self.remote_id, Unset):
             remote_id = UNSET
@@ -260,6 +257,7 @@ class Issue:
             {
                 "url": url,
                 "uuid": uuid,
+                "type": type_,
                 "key": key,
                 "backend_id": backend_id,
                 "backend_name": backend_name,
@@ -291,8 +289,6 @@ class Issue:
                 "add_attachment_is_available": add_attachment_is_available,
             }
         )
-        if type_ is not UNSET:
-            field_dict["type"] = type_
         if remote_id is not UNSET:
             field_dict["remote_id"] = remote_id
         if description is not UNSET:
@@ -323,6 +319,8 @@ class Issue:
 
         uuid = UUID(d.pop("uuid"))
 
+        type_ = d.pop("type")
+
         key = d.pop("key")
 
         def _parse_backend_id(data: object) -> Union[None, str]:
@@ -512,13 +510,6 @@ class Issue:
 
         add_attachment_is_available = d.pop("add_attachment_is_available")
 
-        _type_ = d.pop("type", UNSET)
-        type_: Union[Unset, IssueTypeEnum]
-        if isinstance(_type_, Unset):
-            type_ = UNSET
-        else:
-            type_ = IssueTypeEnum(_type_)
-
         def _parse_remote_id(data: object) -> Union[None, Unset, str]:
             if data is None:
                 return data
@@ -582,6 +573,7 @@ class Issue:
         issue = cls(
             url=url,
             uuid=uuid,
+            type_=type_,
             key=key,
             backend_id=backend_id,
             backend_name=backend_name,
@@ -611,7 +603,6 @@ class Issue:
             destroy_is_available=destroy_is_available,
             add_comment_is_available=add_comment_is_available,
             add_attachment_is_available=add_attachment_is_available,
-            type_=type_,
             remote_id=remote_id,
             description=description,
             priority=priority,

waldur_api_client/models/issue_request.py

@@ -4,7 +4,6 @@ from typing import Any, TypeVar, Union, cast
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
-from ..models.issue_type_enum import IssueTypeEnum
 from ..types import UNSET, Unset
 
 T = TypeVar("T", bound="IssueRequest")
@@ -14,8 +13,8 @@ T = TypeVar("T", bound="IssueRequest")
 class IssueRequest:
     """
     Attributes:
+        type_ (str):
         summary (str):
-        type_ (Union[Unset, IssueTypeEnum]):  Default: IssueTypeEnum.INFORMATIONAL.
         remote_id (Union[None, Unset, str]):
         description (Union[Unset, str]):
         priority (Union[Unset, str]):
@@ -29,8 +28,8 @@ class IssueRequest:
         template (Union[None, Unset, str]):
     """
 
+    type_: str
     summary: str
-    type_: Union[Unset, IssueTypeEnum] = IssueTypeEnum.INFORMATIONAL
     remote_id: Union[None, Unset, str] = UNSET
     description: Union[Unset, str] = UNSET
     priority: Union[Unset, str] = UNSET
@@ -44,11 +43,9 @@ class IssueRequest:
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
-        summary = self.summary
+        type_ = self.type_
 
-        type_: Union[Unset, str] = UNSET
-        if not isinstance(self.type_, Unset):
-            type_ = self.type_.value
+        summary = self.summary
 
         remote_id: Union[None, Unset, str]
         if isinstance(self.remote_id, Unset):
@@ -98,11 +95,10 @@ class IssueRequest:
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
+                "type": type_,
                 "summary": summary,
             }
         )
-        if type_ is not UNSET:
-            field_dict["type"] = type_
         if remote_id is not UNSET:
             field_dict["remote_id"] = remote_id
         if description is not UNSET:
@@ -129,14 +125,9 @@ class IssueRequest:
     @classmethod
     def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         d = dict(src_dict)
-        summary = d.pop("summary")
+        type_ = d.pop("type")
 
-        _type_ = d.pop("type", UNSET)
-        type_: Union[Unset, IssueTypeEnum]
-        if isinstance(_type_, Unset):
-            type_ = UNSET
-        else:
-            type_ = IssueTypeEnum(_type_)
+        summary = d.pop("summary")
 
         def _parse_remote_id(data: object) -> Union[None, Unset, str]:
             if data is None:
@@ -201,8 +192,8 @@ class IssueRequest:
         template = _parse_template(d.pop("template", UNSET))
 
         issue_request = cls(
-            summary=summary,
             type_=type_,
+            summary=summary,
             remote_id=remote_id,
             description=description,
             priority=priority,

waldur_api_client/models/issue_type_enum.py

@@ -2,10 +2,10 @@ from enum import Enum
 
 
 class IssueTypeEnum(str, Enum):
-    CHANGE_REQUEST = "Change Request"
-    INCIDENT = "Incident"
-    INFORMATIONAL = "Informational"
-    SERVICE_REQUEST = "Service Request"
+    CHANGE_REQUEST = "CHANGE_REQUEST"
+    INCIDENT = "INCIDENT"
+    INFORMATIONAL = "INFORMATIONAL"
+    SERVICE_REQUEST = "SERVICE_REQUEST"
 
     def __str__(self) -> str:
         return str(self.value)

waldur_api_client/models/marketplace_offering_users_list_field_item.py

@@ -5,11 +5,13 @@ class MarketplaceOfferingUsersListFieldItem(str, Enum):
     CREATED = "created"
     CUSTOMER_NAME = "customer_name"
     CUSTOMER_UUID = "customer_uuid"
+    HAS_CONSENT = "has_consent"
     IS_RESTRICTED = "is_restricted"
     MODIFIED = "modified"
     OFFERING = "offering"
     OFFERING_NAME = "offering_name"
     OFFERING_UUID = "offering_uuid"
+    REQUIRES_RECONSENT = "requires_reconsent"
     SERVICE_PROVIDER_COMMENT = "service_provider_comment"
     SERVICE_PROVIDER_COMMENT_URL = "service_provider_comment_url"
     STATE = "state"

waldur_api_client/models/marketplace_offering_users_retrieve_field_item.py

@@ -5,11 +5,13 @@ class MarketplaceOfferingUsersRetrieveFieldItem(str, Enum):
     CREATED = "created"
     CUSTOMER_NAME = "customer_name"
     CUSTOMER_UUID = "customer_uuid"
+    HAS_CONSENT = "has_consent"
     IS_RESTRICTED = "is_restricted"
     MODIFIED = "modified"
     OFFERING = "offering"
     OFFERING_NAME = "offering_name"
     OFFERING_UUID = "offering_uuid"
+    REQUIRES_RECONSENT = "requires_reconsent"
     SERVICE_PROVIDER_COMMENT = "service_provider_comment"
     SERVICE_PROVIDER_COMMENT_URL = "service_provider_comment_url"
     STATE = "state"

waldur_api_client/models/marketplace_orders_list_field_item.py

@@ -4,6 +4,7 @@ from enum import Enum
 class MarketplaceOrdersListFieldItem(str, Enum):
     ACCEPTING_TERMS_OF_SERVICE = "accepting_terms_of_service"
     ACTIVATION_PRICE = "activation_price"
+    ATTACHMENT = "attachment"
     ATTRIBUTES = "attributes"
     BACKEND_ID = "backend_id"
     CALLBACK_URL = "callback_url"
@@ -63,6 +64,7 @@ class MarketplaceOrdersListFieldItem(str, Enum):
     PROVIDER_REVIEWED_BY_FULL_NAME = "provider_reviewed_by_full_name"
     PROVIDER_REVIEWED_BY_USERNAME = "provider_reviewed_by_username"
     PROVIDER_UUID = "provider_uuid"
+    REQUEST_COMMENT = "request_comment"
     RESOURCE_NAME = "resource_name"
     RESOURCE_TYPE = "resource_type"
     RESOURCE_UUID = "resource_uuid"

waldur_api_client/models/marketplace_orders_retrieve_field_item.py

@@ -4,6 +4,7 @@ from enum import Enum
 class MarketplaceOrdersRetrieveFieldItem(str, Enum):
     ACCEPTING_TERMS_OF_SERVICE = "accepting_terms_of_service"
     ACTIVATION_PRICE = "activation_price"
+    ATTACHMENT = "attachment"
     ATTRIBUTES = "attributes"
     BACKEND_ID = "backend_id"
     CALLBACK_URL = "callback_url"
@@ -63,6 +64,7 @@ class MarketplaceOrdersRetrieveFieldItem(str, Enum):
     PROVIDER_REVIEWED_BY_FULL_NAME = "provider_reviewed_by_full_name"
     PROVIDER_REVIEWED_BY_USERNAME = "provider_reviewed_by_username"
     PROVIDER_UUID = "provider_uuid"
+    REQUEST_COMMENT = "request_comment"
     RESOURCE_NAME = "resource_name"
     RESOURCE_TYPE = "resource_type"
     RESOURCE_UUID = "resource_uuid"

waldur_api_client/models/marketplace_public_offerings_list_field_item.py

@@ -63,6 +63,7 @@ class MarketplacePublicOfferingsListFieldItem(str, Enum):
     TOTAL_CUSTOMERS = "total_customers"
     TYPE = "type"
     URL = "url"
+    USER_HAS_CONSENT = "user_has_consent"
     UUID = "uuid"
     VENDOR_DETAILS = "vendor_details"
 

waldur_api_client/models/marketplace_public_offerings_retrieve_field_item.py

@@ -63,6 +63,7 @@ class MarketplacePublicOfferingsRetrieveFieldItem(str, Enum):
     TOTAL_CUSTOMERS = "total_customers"
     TYPE = "type"
     URL = "url"
+    USER_HAS_CONSENT = "user_has_consent"
     UUID = "uuid"
     VENDOR_DETAILS = "vendor_details"
 

waldur_api_client/models/merged_plugin_options.py

@@ -7,6 +7,7 @@ from attrs import field as _attrs_field
 from dateutil.parser import isoparse
 
 from ..models.account_name_generation_policy_enum import AccountNameGenerationPolicyEnum
+from ..models.deployment_mode_enum import DeploymentModeEnum
 from ..models.storage_mode_enum import StorageModeEnum
 from ..models.username_generation_policy_enum import UsernameGenerationPolicyEnum
 from ..types import UNSET, Unset
@@ -35,6 +36,8 @@ class MergedPluginOptions:
             resources
         required_team_role_for_provisioning (Union[Unset, str]): Required user role in a project for provisioning of
             resources
+        order_supports_comments_and_metadata (Union[Unset, bool]): If set to True, orders will support comments and
+            metadata
         default_internal_network_mtu (Union[Unset, int]): If set, it will be used as a default MTU for the first network
             in a tenant
         max_instances (Union[Unset, int]): Default limit for number of instances in OpenStack tenant
@@ -53,6 +56,7 @@ class MergedPluginOptions:
         username_generation_policy (Union[Unset, UsernameGenerationPolicyEnum]):  Default:
             UsernameGenerationPolicyEnum.SERVICE_PROVIDER.
         enable_issues_for_membership_changes (Union[Unset, bool]): Enable issues for membership changes
+        deployment_mode (Union[Unset, DeploymentModeEnum]):
         flavors_regex (Union[Unset, str]): Regular expression to limit flavors list
         openstack_offering_uuid_list (Union[Unset, list[str]]): List of UUID of OpenStack offerings where tenant can be
             created
@@ -86,6 +90,7 @@ class MergedPluginOptions:
     supports_pausing: Union[Unset, bool] = UNSET
     minimal_team_count_for_provisioning: Union[Unset, int] = UNSET
     required_team_role_for_provisioning: Union[Unset, str] = UNSET
+    order_supports_comments_and_metadata: Union[Unset, bool] = UNSET
     default_internal_network_mtu: Union[Unset, int] = UNSET
     max_instances: Union[Unset, int] = UNSET
     max_volumes: Union[Unset, int] = UNSET
@@ -104,6 +109,7 @@ class MergedPluginOptions:
         UsernameGenerationPolicyEnum.SERVICE_PROVIDER
     )
     enable_issues_for_membership_changes: Union[Unset, bool] = UNSET
+    deployment_mode: Union[Unset, DeploymentModeEnum] = UNSET
     flavors_regex: Union[Unset, str] = UNSET
     openstack_offering_uuid_list: Union[Unset, list[str]] = UNSET
     managed_rancher_server_flavor_name: Union[Unset, str] = UNSET
@@ -149,6 +155,8 @@ class MergedPluginOptions:
 
         required_team_role_for_provisioning = self.required_team_role_for_provisioning
 
+        order_supports_comments_and_metadata = self.order_supports_comments_and_metadata
+
         default_internal_network_mtu = self.default_internal_network_mtu
 
         max_instances = self.max_instances
@@ -185,6 +193,10 @@ class MergedPluginOptions:
 
         enable_issues_for_membership_changes = self.enable_issues_for_membership_changes
 
+        deployment_mode: Union[Unset, str] = UNSET
+        if not isinstance(self.deployment_mode, Unset):
+            deployment_mode = self.deployment_mode.value
+
         flavors_regex = self.flavors_regex
 
         openstack_offering_uuid_list: Union[Unset, list[str]] = UNSET
@@ -256,6 +268,8 @@ class MergedPluginOptions:
             field_dict["minimal_team_count_for_provisioning"] = minimal_team_count_for_provisioning
         if required_team_role_for_provisioning is not UNSET:
             field_dict["required_team_role_for_provisioning"] = required_team_role_for_provisioning
+        if order_supports_comments_and_metadata is not UNSET:
+            field_dict["order_supports_comments_and_metadata"] = order_supports_comments_and_metadata
         if default_internal_network_mtu is not UNSET:
             field_dict["default_internal_network_mtu"] = default_internal_network_mtu
         if max_instances is not UNSET:
@@ -288,6 +302,8 @@ class MergedPluginOptions:
             field_dict["username_generation_policy"] = username_generation_policy
         if enable_issues_for_membership_changes is not UNSET:
             field_dict["enable_issues_for_membership_changes"] = enable_issues_for_membership_changes
+        if deployment_mode is not UNSET:
+            field_dict["deployment_mode"] = deployment_mode
         if flavors_regex is not UNSET:
             field_dict["flavors_regex"] = flavors_regex
         if openstack_offering_uuid_list is not UNSET:
@@ -369,6 +385,8 @@ class MergedPluginOptions:
 
         required_team_role_for_provisioning = d.pop("required_team_role_for_provisioning", UNSET)
 
+        order_supports_comments_and_metadata = d.pop("order_supports_comments_and_metadata", UNSET)
+
         default_internal_network_mtu = d.pop("default_internal_network_mtu", UNSET)
 
         max_instances = d.pop("max_instances", UNSET)
@@ -411,6 +429,13 @@ class MergedPluginOptions:
 
         enable_issues_for_membership_changes = d.pop("enable_issues_for_membership_changes", UNSET)
 
+        _deployment_mode = d.pop("deployment_mode", UNSET)
+        deployment_mode: Union[Unset, DeploymentModeEnum]
+        if isinstance(_deployment_mode, Unset):
+            deployment_mode = UNSET
+        else:
+            deployment_mode = DeploymentModeEnum(_deployment_mode)
+
         flavors_regex = d.pop("flavors_regex", UNSET)
 
         openstack_offering_uuid_list = cast(list[str], d.pop("openstack_offering_uuid_list", UNSET))
@@ -484,6 +509,7 @@ class MergedPluginOptions:
             supports_pausing=supports_pausing,
             minimal_team_count_for_provisioning=minimal_team_count_for_provisioning,
             required_team_role_for_provisioning=required_team_role_for_provisioning,
+            order_supports_comments_and_metadata=order_supports_comments_and_metadata,
             default_internal_network_mtu=default_internal_network_mtu,
             max_instances=max_instances,
             max_volumes=max_volumes,
@@ -500,6 +526,7 @@ class MergedPluginOptions:
             username_anonymized_prefix=username_anonymized_prefix,
             username_generation_policy=username_generation_policy,
             enable_issues_for_membership_changes=enable_issues_for_membership_changes,
+            deployment_mode=deployment_mode,
             flavors_regex=flavors_regex,
             openstack_offering_uuid_list=openstack_offering_uuid_list,
             managed_rancher_server_flavor_name=managed_rancher_server_flavor_name,