oci 2.126.4__py3-none-any.whl → 2.128.0__py3-none-any.whl

oci/capacity_management/models/__init__.py

@@ -17,12 +17,13 @@ from .occ_availability_summary import OccAvailabilitySummary
 from .occ_capacity_request import OccCapacityRequest
 from .occ_capacity_request_base_details import OccCapacityRequestBaseDetails
 from .occ_capacity_request_collection import OccCapacityRequestCollection
-from .occ_capacity_request_compute_details import OccCapacityRequestComputeDetails
 from .occ_capacity_request_summary import OccCapacityRequestSummary
 from .occ_customer import OccCustomer
 from .occ_customer_group import OccCustomerGroup
 from .occ_customer_group_collection import OccCustomerGroupCollection
 from .occ_customer_group_summary import OccCustomerGroupSummary
+from .occ_overview_collection import OccOverviewCollection
+from .occ_overview_summary import OccOverviewSummary
 from .patch_insert_instruction import PatchInsertInstruction
 from .patch_insert_multiple_instruction import PatchInsertMultipleInstruction
 from .patch_instruction import PatchInstruction
@@ -50,12 +51,13 @@ capacity_management_type_mapping = {
     "OccCapacityRequest": OccCapacityRequest,
     "OccCapacityRequestBaseDetails": OccCapacityRequestBaseDetails,
     "OccCapacityRequestCollection": OccCapacityRequestCollection,
-    "OccCapacityRequestComputeDetails": OccCapacityRequestComputeDetails,
     "OccCapacityRequestSummary": OccCapacityRequestSummary,
     "OccCustomer": OccCustomer,
     "OccCustomerGroup": OccCustomerGroup,
     "OccCustomerGroupCollection": OccCustomerGroupCollection,
     "OccCustomerGroupSummary": OccCustomerGroupSummary,
+    "OccOverviewCollection": OccOverviewCollection,
+    "OccOverviewSummary": OccOverviewSummary,
     "PatchInsertInstruction": PatchInsertInstruction,
     "PatchInsertMultipleInstruction": PatchInsertMultipleInstruction,
     "PatchInstruction": PatchInstruction,

oci/capacity_management/models/create_occ_capacity_request_details.py

@@ -53,6 +53,10 @@ class CreateOccCapacityRequestDetails(object):
             The value to assign to the display_name property of this CreateOccCapacityRequestDetails.
         :type display_name: str
 
+        :param request_type:
+            The value to assign to the request_type property of this CreateOccCapacityRequestDetails.
+        :type request_type: str
+
         :param description:
             The value to assign to the description property of this CreateOccCapacityRequestDetails.
         :type description: str
@@ -93,6 +97,7 @@ class CreateOccCapacityRequestDetails(object):
             'namespace': 'str',
             'region': 'str',
             'display_name': 'str',
+            'request_type': 'str',
             'description': 'str',
             'freeform_tags': 'dict(str, str)',
             'defined_tags': 'dict(str, dict(str, object))',
@@ -109,6 +114,7 @@ class CreateOccCapacityRequestDetails(object):
             'namespace': 'namespace',
             'region': 'region',
             'display_name': 'displayName',
+            'request_type': 'requestType',
             'description': 'description',
             'freeform_tags': 'freeformTags',
             'defined_tags': 'definedTags',
@@ -124,6 +130,7 @@ class CreateOccCapacityRequestDetails(object):
         self._namespace = None
         self._region = None
         self._display_name = None
+        self._request_type = None
         self._description = None
         self._freeform_tags = None
         self._defined_tags = None
@@ -160,7 +167,7 @@ class CreateOccCapacityRequestDetails(object):
     @property
     def occ_availability_catalog_id(self):
         """
-        **[Required]** Gets the occ_availability_catalog_id of this CreateOccCapacityRequestDetails.
+        Gets the occ_availability_catalog_id of this CreateOccCapacityRequestDetails.
         The OCID of the availability catalog against which capacity request is made.
 
 
@@ -260,6 +267,30 @@ class CreateOccCapacityRequestDetails(object):
         """
         self._display_name = display_name
 
+    @property
+    def request_type(self):
+        """
+        Gets the request_type of this CreateOccCapacityRequestDetails.
+        Type of Capacity Request(New or Transfer)
+
+
+        :return: The request_type of this CreateOccCapacityRequestDetails.
+        :rtype: str
+        """
+        return self._request_type
+
+    @request_type.setter
+    def request_type(self, request_type):
+        """
+        Sets the request_type of this CreateOccCapacityRequestDetails.
+        Type of Capacity Request(New or Transfer)
+
+
+        :param request_type: The request_type of this CreateOccCapacityRequestDetails.
+        :type: str
+        """
+        self._request_type = request_type
+
     @property
     def description(self):
         """

oci/capacity_management/models/metadata_details.py

@@ -19,6 +19,10 @@ class MetadataDetails(object):
     #: This constant has a value of "V1"
     FORMAT_VERSION_V1 = "V1"
 
+    #: A constant which can be used with the format_version property of a MetadataDetails.
+    #: This constant has a value of "V2"
+    FORMAT_VERSION_V2 = "V2"
+
     def __init__(self, **kwargs):
         """
         Initializes a new MetadataDetails object with values from keyword arguments.
@@ -26,7 +30,7 @@ class MetadataDetails(object):
 
         :param format_version:
             The value to assign to the format_version property of this MetadataDetails.
-            Allowed values for this property are: "V1", 'UNKNOWN_ENUM_VALUE'.
+            Allowed values for this property are: "V1", "V2", 'UNKNOWN_ENUM_VALUE'.
             Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
         :type format_version: str
 
@@ -47,7 +51,7 @@ class MetadataDetails(object):
         **[Required]** Gets the format_version of this MetadataDetails.
         The version for the format of the catalog file being uploaded.
 
-        Allowed values for this property are: "V1", 'UNKNOWN_ENUM_VALUE'.
+        Allowed values for this property are: "V1", "V2", 'UNKNOWN_ENUM_VALUE'.
         Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
 
 
@@ -66,7 +70,7 @@ class MetadataDetails(object):
         :param format_version: The format_version of this MetadataDetails.
         :type: str
         """
-        allowed_values = ["V1"]
+        allowed_values = ["V1", "V2"]
         if not value_allowed_none_or_none_sentinel(format_version, allowed_values):
             format_version = 'UNKNOWN_ENUM_VALUE'
         self._format_version = format_version

oci/capacity_management/models/occ_availability_catalog.py

@@ -582,7 +582,7 @@ class OccAvailabilityCatalog(object):
     def details(self):
         """
         Gets the details of this OccAvailabilityCatalog.
-        Details about capacity available for  different resources in catalog.
+        Details about capacity available for different resources in catalog.
 
 
         :return: The details of this OccAvailabilityCatalog.
@@ -594,7 +594,7 @@ class OccAvailabilityCatalog(object):
     def details(self, details):
         """
         Sets the details of this OccAvailabilityCatalog.
-        Details about capacity available for  different resources in catalog.
+        Details about capacity available for different resources in catalog.
 
 
         :param details: The details of this OccAvailabilityCatalog.

oci/capacity_management/models/occ_availability_catalog_summary.py

@@ -221,7 +221,7 @@ class OccAvailabilityCatalogSummary(object):
     def display_name(self):
         """
         **[Required]** Gets the display_name of this OccAvailabilityCatalogSummary.
-        An user-friendly name for the availability catalog. Does not have to be unique, and it's changeable. Avoid entering confidential information.
+        An user-friendly name for the availability catalog. Does not have to be unique, and is changeable. Avoid entering confidential information.
 
 
         :return: The display_name of this OccAvailabilityCatalogSummary.
@@ -233,7 +233,7 @@ class OccAvailabilityCatalogSummary(object):
     def display_name(self, display_name):
         """
         Sets the display_name of this OccAvailabilityCatalogSummary.
-        An user-friendly name for the availability catalog. Does not have to be unique, and it's changeable. Avoid entering confidential information.
+        An user-friendly name for the availability catalog. Does not have to be unique, and is changeable. Avoid entering confidential information.
 
 
         :param display_name: The display_name of this OccAvailabilityCatalogSummary.

oci/capacity_management/models/occ_availability_summary.py

@@ -19,26 +19,6 @@ class OccAvailabilitySummary(object):
     #: This constant has a value of "COMPUTE"
     NAMESPACE_COMPUTE = "COMPUTE"
 
-    #: A constant which can be used with the resource_type property of a OccAvailabilitySummary.
-    #: This constant has a value of "SERVER_HW"
-    RESOURCE_TYPE_SERVER_HW = "SERVER_HW"
-
-    #: A constant which can be used with the resource_type property of a OccAvailabilitySummary.
-    #: This constant has a value of "CAPACITY_CONSTRAINT"
-    RESOURCE_TYPE_CAPACITY_CONSTRAINT = "CAPACITY_CONSTRAINT"
-
-    #: A constant which can be used with the workload_type property of a OccAvailabilitySummary.
-    #: This constant has a value of "GENERIC"
-    WORKLOAD_TYPE_GENERIC = "GENERIC"
-
-    #: A constant which can be used with the workload_type property of a OccAvailabilitySummary.
-    #: This constant has a value of "ROW"
-    WORKLOAD_TYPE_ROW = "ROW"
-
-    #: A constant which can be used with the workload_type property of a OccAvailabilitySummary.
-    #: This constant has a value of "US_PROD"
-    WORKLOAD_TYPE_US_PROD = "US_PROD"
-
     def __init__(self, **kwargs):
         """
         Initializes a new OccAvailabilitySummary object with values from keyword arguments.
@@ -64,14 +44,10 @@ class OccAvailabilitySummary(object):
 
         :param resource_type:
             The value to assign to the resource_type property of this OccAvailabilitySummary.
-            Allowed values for this property are: "SERVER_HW", "CAPACITY_CONSTRAINT", 'UNKNOWN_ENUM_VALUE'.
-            Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
         :type resource_type: str
 
         :param workload_type:
             The value to assign to the workload_type property of this OccAvailabilitySummary.
-            Allowed values for this property are: "GENERIC", "ROW", "US_PROD", 'UNKNOWN_ENUM_VALUE'.
-            Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
         :type workload_type: str
 
         :param resource_name:
@@ -82,10 +58,22 @@ class OccAvailabilitySummary(object):
             The value to assign to the available_quantity property of this OccAvailabilitySummary.
         :type available_quantity: int
 
+        :param total_available_quantity:
+            The value to assign to the total_available_quantity property of this OccAvailabilitySummary.
+        :type total_available_quantity: int
+
+        :param demanded_quantity:
+            The value to assign to the demanded_quantity property of this OccAvailabilitySummary.
+        :type demanded_quantity: int
+
         :param unit:
             The value to assign to the unit property of this OccAvailabilitySummary.
         :type unit: str
 
+        :param system_tags:
+            The value to assign to the system_tags property of this OccAvailabilitySummary.
+        :type system_tags: dict(str, dict(str, object))
+
         """
         self.swagger_types = {
             'catalog_id': 'str',
@@ -96,7 +84,10 @@ class OccAvailabilitySummary(object):
             'workload_type': 'str',
             'resource_name': 'str',
             'available_quantity': 'int',
-            'unit': 'str'
+            'total_available_quantity': 'int',
+            'demanded_quantity': 'int',
+            'unit': 'str',
+            'system_tags': 'dict(str, dict(str, object))'
         }
 
         self.attribute_map = {
@@ -108,7 +99,10 @@ class OccAvailabilitySummary(object):
             'workload_type': 'workloadType',
             'resource_name': 'resourceName',
             'available_quantity': 'availableQuantity',
-            'unit': 'unit'
+            'total_available_quantity': 'totalAvailableQuantity',
+            'demanded_quantity': 'demandedQuantity',
+            'unit': 'unit',
+            'system_tags': 'systemTags'
         }
 
         self._catalog_id = None
@@ -119,7 +113,10 @@ class OccAvailabilitySummary(object):
         self._workload_type = None
         self._resource_name = None
         self._available_quantity = None
+        self._total_available_quantity = None
+        self._demanded_quantity = None
         self._unit = None
+        self._system_tags = None
 
     @property
     def catalog_id(self):
@@ -229,9 +226,6 @@ class OccAvailabilitySummary(object):
         **[Required]** Gets the resource_type of this OccAvailabilitySummary.
         The different types of resources against which customers can place capacity requests.
 
-        Allowed values for this property are: "SERVER_HW", "CAPACITY_CONSTRAINT", 'UNKNOWN_ENUM_VALUE'.
-        Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
-
 
         :return: The resource_type of this OccAvailabilitySummary.
         :rtype: str
@@ -248,9 +242,6 @@ class OccAvailabilitySummary(object):
         :param resource_type: The resource_type of this OccAvailabilitySummary.
         :type: str
         """
-        allowed_values = ["SERVER_HW", "CAPACITY_CONSTRAINT"]
-        if not value_allowed_none_or_none_sentinel(resource_type, allowed_values):
-            resource_type = 'UNKNOWN_ENUM_VALUE'
         self._resource_type = resource_type
 
     @property
@@ -259,9 +250,6 @@ class OccAvailabilitySummary(object):
         **[Required]** Gets the workload_type of this OccAvailabilitySummary.
         The type of workload (Generic/ROW).
 
-        Allowed values for this property are: "GENERIC", "ROW", "US_PROD", 'UNKNOWN_ENUM_VALUE'.
-        Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
-
 
         :return: The workload_type of this OccAvailabilitySummary.
         :rtype: str
@@ -278,9 +266,6 @@ class OccAvailabilitySummary(object):
         :param workload_type: The workload_type of this OccAvailabilitySummary.
         :type: str
         """
-        allowed_values = ["GENERIC", "ROW", "US_PROD"]
-        if not value_allowed_none_or_none_sentinel(workload_type, allowed_values):
-            workload_type = 'UNKNOWN_ENUM_VALUE'
         self._workload_type = workload_type
 
     @property
@@ -311,7 +296,7 @@ class OccAvailabilitySummary(object):
     def available_quantity(self):
         """
         **[Required]** Gets the available_quantity of this OccAvailabilitySummary.
-        The quantity of available resource that the customer can request.
+        The quantity of resource currently available that the customer can request.
 
 
         :return: The available_quantity of this OccAvailabilitySummary.
@@ -323,7 +308,7 @@ class OccAvailabilitySummary(object):
     def available_quantity(self, available_quantity):
         """
         Sets the available_quantity of this OccAvailabilitySummary.
-        The quantity of available resource that the customer can request.
+        The quantity of resource currently available that the customer can request.
 
 
         :param available_quantity: The available_quantity of this OccAvailabilitySummary.
@@ -331,6 +316,54 @@ class OccAvailabilitySummary(object):
         """
         self._available_quantity = available_quantity
 
+    @property
+    def total_available_quantity(self):
+        """
+        **[Required]** Gets the total_available_quantity of this OccAvailabilitySummary.
+        The total quantity of resource that the customer can request.
+
+
+        :return: The total_available_quantity of this OccAvailabilitySummary.
+        :rtype: int
+        """
+        return self._total_available_quantity
+
+    @total_available_quantity.setter
+    def total_available_quantity(self, total_available_quantity):
+        """
+        Sets the total_available_quantity of this OccAvailabilitySummary.
+        The total quantity of resource that the customer can request.
+
+
+        :param total_available_quantity: The total_available_quantity of this OccAvailabilitySummary.
+        :type: int
+        """
+        self._total_available_quantity = total_available_quantity
+
+    @property
+    def demanded_quantity(self):
+        """
+        **[Required]** Gets the demanded_quantity of this OccAvailabilitySummary.
+        The quantity of resource currently demanded by the customer.
+
+
+        :return: The demanded_quantity of this OccAvailabilitySummary.
+        :rtype: int
+        """
+        return self._demanded_quantity
+
+    @demanded_quantity.setter
+    def demanded_quantity(self, demanded_quantity):
+        """
+        Sets the demanded_quantity of this OccAvailabilitySummary.
+        The quantity of resource currently demanded by the customer.
+
+
+        :param demanded_quantity: The demanded_quantity of this OccAvailabilitySummary.
+        :type: int
+        """
+        self._demanded_quantity = demanded_quantity
+
     @property
     def unit(self):
         """
@@ -355,6 +388,32 @@ class OccAvailabilitySummary(object):
         """
         self._unit = unit
 
+    @property
+    def system_tags(self):
+        """
+        Gets the system_tags of this OccAvailabilitySummary.
+        System tags for this resource. Each key is predefined and scoped to a namespace.
+        Example: `{\"orcl-cloud\": {\"free-tier-retained\": \"true\"}}`
+
+
+        :return: The system_tags of this OccAvailabilitySummary.
+        :rtype: dict(str, dict(str, object))
+        """
+        return self._system_tags
+
+    @system_tags.setter
+    def system_tags(self, system_tags):
+        """
+        Sets the system_tags of this OccAvailabilitySummary.
+        System tags for this resource. Each key is predefined and scoped to a namespace.
+        Example: `{\"orcl-cloud\": {\"free-tier-retained\": \"true\"}}`
+
+
+        :param system_tags: The system_tags of this OccAvailabilitySummary.
+        :type: dict(str, dict(str, object))
+        """
+        self._system_tags = system_tags
+
     def __repr__(self):
         return formatted_flat_dict(self)
 

oci/capacity_management/models/occ_capacity_request.py

@@ -19,6 +19,14 @@ class OccCapacityRequest(object):
     #: This constant has a value of "COMPUTE"
     NAMESPACE_COMPUTE = "COMPUTE"
 
+    #: A constant which can be used with the request_type property of a OccCapacityRequest.
+    #: This constant has a value of "NEW"
+    REQUEST_TYPE_NEW = "NEW"
+
+    #: A constant which can be used with the request_type property of a OccCapacityRequest.
+    #: This constant has a value of "TRANSFER"
+    REQUEST_TYPE_TRANSFER = "TRANSFER"
+
     #: A constant which can be used with the request_state property of a OccCapacityRequest.
     #: This constant has a value of "CREATED"
     REQUEST_STATE_CREATED = "CREATED"
@@ -110,6 +118,12 @@ class OccCapacityRequest(object):
             The value to assign to the occ_customer_group_id property of this OccCapacityRequest.
         :type occ_customer_group_id: str
 
+        :param request_type:
+            The value to assign to the request_type property of this OccCapacityRequest.
+            Allowed values for this property are: "NEW", "TRANSFER", 'UNKNOWN_ENUM_VALUE'.
+            Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
+        :type request_type: str
+
         :param region:
             The value to assign to the region property of this OccCapacityRequest.
         :type region: str
@@ -171,6 +185,7 @@ class OccCapacityRequest(object):
             'description': 'str',
             'namespace': 'str',
             'occ_customer_group_id': 'str',
+            'request_type': 'str',
             'region': 'str',
             'availability_domain': 'str',
             'date_expected_capacity_handover': 'datetime',
@@ -193,6 +208,7 @@ class OccCapacityRequest(object):
             'description': 'description',
             'namespace': 'namespace',
             'occ_customer_group_id': 'occCustomerGroupId',
+            'request_type': 'requestType',
             'region': 'region',
             'availability_domain': 'availabilityDomain',
             'date_expected_capacity_handover': 'dateExpectedCapacityHandover',
@@ -214,6 +230,7 @@ class OccCapacityRequest(object):
         self._description = None
         self._namespace = None
         self._occ_customer_group_id = None
+        self._request_type = None
         self._region = None
         self._availability_domain = None
         self._date_expected_capacity_handover = None
@@ -401,6 +418,36 @@ class OccCapacityRequest(object):
         """
         self._occ_customer_group_id = occ_customer_group_id
 
+    @property
+    def request_type(self):
+        """
+        Gets the request_type of this OccCapacityRequest.
+        Type of Capacity Request(New or Transfer)
+
+        Allowed values for this property are: "NEW", "TRANSFER", 'UNKNOWN_ENUM_VALUE'.
+        Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'.
+
+
+        :return: The request_type of this OccCapacityRequest.
+        :rtype: str
+        """
+        return self._request_type
+
+    @request_type.setter
+    def request_type(self, request_type):
+        """
+        Sets the request_type of this OccCapacityRequest.
+        Type of Capacity Request(New or Transfer)
+
+
+        :param request_type: The request_type of this OccCapacityRequest.
+        :type: str
+        """
+        allowed_values = ["NEW", "TRANSFER"]
+        if not value_allowed_none_or_none_sentinel(request_type, allowed_values):
+            request_type = 'UNKNOWN_ENUM_VALUE'
+        self._request_type = request_type
+
     @property
     def region(self):
         """