diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 68a0b2b734..3ded7f3d4c 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -3,6 +3,25 @@ Change Log All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `_. +==================== +2.88.0 - 2022-11-08 +==================== + +Added +----- +* Support for listing local and cross-region refreshable clones in the Database service +* Support for adding multiple cloud VM clusters in the Database service +* Support for creating rollback jobs in the Resource Manager service +* Support for edge nodes in the Big Data service +* Support for Single Client Access Name (SCAN) in the Data Flow service +* Support for additional filters when listing application dependencies in the Application Dependency Management service +* Support for additional properties when reading Vulnerability Audit resources in the Application Dependency Management service +* Support for optionally passing compartment IDs when creating Vulnerability Audit resources in the Application Dependency Management service + +Breaking +-------- +* Property `certificate_id` changed from optional to required for model `PrivateServerConfigDetails` in the Resource Manager service + ==================== 2.87.0 - 2022-11-01 ==================== diff --git a/docs/api/adm.rst b/docs/api/adm.rst index 7008fb6e34..c0aa1ff32e 100644 --- a/docs/api/adm.rst +++ b/docs/api/adm.rst @@ -25,15 +25,19 @@ Adm oci.adm.models.ChangeVulnerabilityAuditCompartmentDetails oci.adm.models.CreateKnowledgeBaseDetails oci.adm.models.CreateVulnerabilityAuditDetails + oci.adm.models.ExternalResourceVulnerabilityAuditSource oci.adm.models.KnowledgeBase oci.adm.models.KnowledgeBaseCollection oci.adm.models.KnowledgeBaseSummary + oci.adm.models.OciResourceVulnerabilityAuditSource + oci.adm.models.UnknownSourceVulnerabilityAuditSource oci.adm.models.UpdateKnowledgeBaseDetails oci.adm.models.UpdateVulnerabilityAuditDetails oci.adm.models.Vulnerability oci.adm.models.VulnerabilityAudit oci.adm.models.VulnerabilityAuditCollection oci.adm.models.VulnerabilityAuditConfiguration + oci.adm.models.VulnerabilityAuditSource oci.adm.models.VulnerabilityAuditSummary oci.adm.models.WorkRequest oci.adm.models.WorkRequestError diff --git a/docs/api/adm/models/oci.adm.models.ExternalResourceVulnerabilityAuditSource.rst b/docs/api/adm/models/oci.adm.models.ExternalResourceVulnerabilityAuditSource.rst new file mode 100644 index 0000000000..9eed574df6 --- /dev/null +++ b/docs/api/adm/models/oci.adm.models.ExternalResourceVulnerabilityAuditSource.rst @@ -0,0 +1,11 @@ +ExternalResourceVulnerabilityAuditSource +======================================== + +.. currentmodule:: oci.adm.models + +.. autoclass:: ExternalResourceVulnerabilityAuditSource + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/adm/models/oci.adm.models.OciResourceVulnerabilityAuditSource.rst b/docs/api/adm/models/oci.adm.models.OciResourceVulnerabilityAuditSource.rst new file mode 100644 index 0000000000..b360cb9054 --- /dev/null +++ b/docs/api/adm/models/oci.adm.models.OciResourceVulnerabilityAuditSource.rst @@ -0,0 +1,11 @@ +OciResourceVulnerabilityAuditSource +=================================== + +.. currentmodule:: oci.adm.models + +.. autoclass:: OciResourceVulnerabilityAuditSource + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/adm/models/oci.adm.models.UnknownSourceVulnerabilityAuditSource.rst b/docs/api/adm/models/oci.adm.models.UnknownSourceVulnerabilityAuditSource.rst new file mode 100644 index 0000000000..36e54e04fd --- /dev/null +++ b/docs/api/adm/models/oci.adm.models.UnknownSourceVulnerabilityAuditSource.rst @@ -0,0 +1,11 @@ +UnknownSourceVulnerabilityAuditSource +===================================== + +.. currentmodule:: oci.adm.models + +.. autoclass:: UnknownSourceVulnerabilityAuditSource + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/adm/models/oci.adm.models.VulnerabilityAuditSource.rst b/docs/api/adm/models/oci.adm.models.VulnerabilityAuditSource.rst new file mode 100644 index 0000000000..6377633e5f --- /dev/null +++ b/docs/api/adm/models/oci.adm.models.VulnerabilityAuditSource.rst @@ -0,0 +1,11 @@ +VulnerabilityAuditSource +======================== + +.. currentmodule:: oci.adm.models + +.. autoclass:: VulnerabilityAuditSource + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/data_flow.rst b/docs/api/data_flow.rst index 71e73427c0..fb91e09e66 100644 --- a/docs/api/data_flow.rst +++ b/docs/api/data_flow.rst @@ -36,6 +36,7 @@ Data Flow oci.data_flow.models.Run oci.data_flow.models.RunLogSummary oci.data_flow.models.RunSummary + oci.data_flow.models.Scan oci.data_flow.models.ShapeConfig oci.data_flow.models.Statement oci.data_flow.models.StatementCollection diff --git a/docs/api/data_flow/models/oci.data_flow.models.Scan.rst b/docs/api/data_flow/models/oci.data_flow.models.Scan.rst new file mode 100644 index 0000000000..b518990973 --- /dev/null +++ b/docs/api/data_flow/models/oci.data_flow.models.Scan.rst @@ -0,0 +1,11 @@ +Scan +==== + +.. currentmodule:: oci.data_flow.models + +.. autoclass:: Scan + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database.rst b/docs/api/database.rst index e3d3670017..1132227a3d 100644 --- a/docs/api/database.rst +++ b/docs/api/database.rst @@ -19,6 +19,7 @@ Database :template: autosummary/model_class.rst oci.database.models.ActivateExadataInfrastructureDetails + oci.database.models.AddVirtualMachineToCloudVmClusterDetails oci.database.models.AddVirtualMachineToVmClusterDetails oci.database.models.AssociatedDatabaseDetails oci.database.models.AutomatedMountDetails @@ -69,6 +70,7 @@ Database oci.database.models.CloudAutonomousVmCluster oci.database.models.CloudAutonomousVmClusterSummary oci.database.models.CloudDatabaseManagementConfig + oci.database.models.CloudDbServerDetails oci.database.models.CloudExadataInfrastructure oci.database.models.CloudExadataInfrastructureSummary oci.database.models.CloudVmCluster @@ -256,9 +258,12 @@ Database oci.database.models.PluggableDatabase oci.database.models.PluggableDatabaseConnectionStrings oci.database.models.PluggableDatabaseSummary + oci.database.models.RefreshableCloneCollection + oci.database.models.RefreshableCloneSummary oci.database.models.RegisterAutonomousDatabaseDataSafeDetails oci.database.models.ReinstateDataGuardAssociationDetails oci.database.models.RemoteClonePluggableDatabaseDetails + oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails oci.database.models.RemoveVirtualMachineFromVmClusterDetails oci.database.models.ResizeVmClusterNetworkDetails oci.database.models.RestoreAutonomousDatabaseDetails diff --git a/docs/api/database/models/oci.database.models.AddVirtualMachineToCloudVmClusterDetails.rst b/docs/api/database/models/oci.database.models.AddVirtualMachineToCloudVmClusterDetails.rst new file mode 100644 index 0000000000..927e1a9059 --- /dev/null +++ b/docs/api/database/models/oci.database.models.AddVirtualMachineToCloudVmClusterDetails.rst @@ -0,0 +1,11 @@ +AddVirtualMachineToCloudVmClusterDetails +======================================== + +.. currentmodule:: oci.database.models + +.. autoclass:: AddVirtualMachineToCloudVmClusterDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database/models/oci.database.models.CloudDbServerDetails.rst b/docs/api/database/models/oci.database.models.CloudDbServerDetails.rst new file mode 100644 index 0000000000..754500c667 --- /dev/null +++ b/docs/api/database/models/oci.database.models.CloudDbServerDetails.rst @@ -0,0 +1,11 @@ +CloudDbServerDetails +==================== + +.. currentmodule:: oci.database.models + +.. autoclass:: CloudDbServerDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database/models/oci.database.models.RefreshableCloneCollection.rst b/docs/api/database/models/oci.database.models.RefreshableCloneCollection.rst new file mode 100644 index 0000000000..ccc465596f --- /dev/null +++ b/docs/api/database/models/oci.database.models.RefreshableCloneCollection.rst @@ -0,0 +1,11 @@ +RefreshableCloneCollection +========================== + +.. currentmodule:: oci.database.models + +.. autoclass:: RefreshableCloneCollection + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database/models/oci.database.models.RefreshableCloneSummary.rst b/docs/api/database/models/oci.database.models.RefreshableCloneSummary.rst new file mode 100644 index 0000000000..f17594bd5d --- /dev/null +++ b/docs/api/database/models/oci.database.models.RefreshableCloneSummary.rst @@ -0,0 +1,11 @@ +RefreshableCloneSummary +======================= + +.. currentmodule:: oci.database.models + +.. autoclass:: RefreshableCloneSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/database/models/oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails.rst b/docs/api/database/models/oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails.rst new file mode 100644 index 0000000000..25a361e37d --- /dev/null +++ b/docs/api/database/models/oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails.rst @@ -0,0 +1,11 @@ +RemoveVirtualMachineFromCloudVmClusterDetails +============================================= + +.. currentmodule:: oci.database.models + +.. autoclass:: RemoveVirtualMachineFromCloudVmClusterDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager.rst b/docs/api/resource_manager.rst index 954f89e133..84eccfc62c 100644 --- a/docs/api/resource_manager.rst +++ b/docs/api/resource_manager.rst @@ -21,6 +21,8 @@ Resource Manager oci.resource_manager.models.ApplyJobOperationDetails oci.resource_manager.models.ApplyJobOperationDetailsSummary oci.resource_manager.models.ApplyJobPlanResolution + oci.resource_manager.models.ApplyRollbackJobOperationDetails + oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary oci.resource_manager.models.CancellationDetails oci.resource_manager.models.ChangeConfigurationSourceProviderCompartmentDetails oci.resource_manager.models.ChangePrivateEndpointCompartmentDetails @@ -33,6 +35,7 @@ Resource Manager oci.resource_manager.models.ConfigurationSourceProviderCollection oci.resource_manager.models.ConfigurationSourceProviderSummary oci.resource_manager.models.CreateApplyJobOperationDetails + oci.resource_manager.models.CreateApplyRollbackJobOperationDetails oci.resource_manager.models.CreateCompartmentConfigSourceDetails oci.resource_manager.models.CreateConfigSourceDetails oci.resource_manager.models.CreateConfigurationSourceProviderDetails @@ -45,6 +48,7 @@ Resource Manager oci.resource_manager.models.CreateJobOperationDetails oci.resource_manager.models.CreateObjectStorageConfigSourceDetails oci.resource_manager.models.CreatePlanJobOperationDetails + oci.resource_manager.models.CreatePlanRollbackJobOperationDetails oci.resource_manager.models.CreatePrivateEndpointDetails oci.resource_manager.models.CreateStackDetails oci.resource_manager.models.CreateStackTemplateConfigSourceDetails @@ -74,6 +78,8 @@ Resource Manager oci.resource_manager.models.ObjectStorageConfigSourceRecord oci.resource_manager.models.PlanJobOperationDetails oci.resource_manager.models.PlanJobOperationDetailsSummary + oci.resource_manager.models.PlanRollbackJobOperationDetails + oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary oci.resource_manager.models.PrivateEndpoint oci.resource_manager.models.PrivateEndpointCollection oci.resource_manager.models.PrivateEndpointSummary diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetails.rst b/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetails.rst new file mode 100644 index 0000000000..331b1259a8 --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetails.rst @@ -0,0 +1,11 @@ +ApplyRollbackJobOperationDetails +================================ + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: ApplyRollbackJobOperationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary.rst b/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary.rst new file mode 100644 index 0000000000..3a1ab59a86 --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary.rst @@ -0,0 +1,11 @@ +ApplyRollbackJobOperationDetailsSummary +======================================= + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: ApplyRollbackJobOperationDetailsSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.CreateApplyRollbackJobOperationDetails.rst b/docs/api/resource_manager/models/oci.resource_manager.models.CreateApplyRollbackJobOperationDetails.rst new file mode 100644 index 0000000000..a0e6fc1ade --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.CreateApplyRollbackJobOperationDetails.rst @@ -0,0 +1,11 @@ +CreateApplyRollbackJobOperationDetails +====================================== + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: CreateApplyRollbackJobOperationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.CreatePlanRollbackJobOperationDetails.rst b/docs/api/resource_manager/models/oci.resource_manager.models.CreatePlanRollbackJobOperationDetails.rst new file mode 100644 index 0000000000..b3f52cb7d8 --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.CreatePlanRollbackJobOperationDetails.rst @@ -0,0 +1,11 @@ +CreatePlanRollbackJobOperationDetails +===================================== + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: CreatePlanRollbackJobOperationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetails.rst b/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetails.rst new file mode 100644 index 0000000000..3797acd7e3 --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetails.rst @@ -0,0 +1,11 @@ +PlanRollbackJobOperationDetails +=============================== + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: PlanRollbackJobOperationDetails + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary.rst b/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary.rst new file mode 100644 index 0000000000..918d85db8e --- /dev/null +++ b/docs/api/resource_manager/models/oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary.rst @@ -0,0 +1,11 @@ +PlanRollbackJobOperationDetailsSummary +====================================== + +.. currentmodule:: oci.resource_manager.models + +.. autoclass:: PlanRollbackJobOperationDetailsSummary + :show-inheritance: + :special-members: __init__ + :members: + :undoc-members: + :inherited-members: \ No newline at end of file diff --git a/src/oci/adm/application_dependency_management_client.py b/src/oci/adm/application_dependency_management_client.py index 47729a97dc..fa062464a0 100644 --- a/src/oci/adm/application_dependency_management_client.py +++ b/src/oci/adm/application_dependency_management_client.py @@ -1156,10 +1156,21 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** :param str sort_by: (optional) The field to sort by. Only one sort order may be provided. + If sort order is dfs, the nodes are returned by going through the application dependency tree in a depth-first manner. Children are sorted based on their GAV property alphabetically (either ascending or descending, depending on the order parameter). Default order is ascending. + If sort order is bfs, the nodes are returned by going through the application dependency tree in a breadth-first manner. Children are sorted based on their GAV property alphabetically (either ascending or descending, depending on the order parameter). Default order is ascending. Default order for gav is ascending where ascending corresponds to alphanumerical order. Default order for nodeId is ascending where ascending corresponds to alphanumerical order. + Sorting by DFS or BFS cannot be used in conjunction with the following query parameters: \"gav\", \"cvssV2GreaterThanOrEqual\", \"cvssV3GreaterThanOrEqual\" and \"vulnerabilityId\". - Allowed values are: "gav", "nodeId" + Allowed values are: "gav", "nodeId", "dfs", "bfs" + + :param str root_node_id: (optional) + A filter to override the top level root identifier with the new given value. The application dependency tree will only be traversed from the given node. + Query parameters \"cvssV2GreaterThanOrEqual\", \"cvssV3GreaterThanOrEqual\", \"gav\" and \"vulnerabilityId\" cannot be used in conjunction with this parameter. + + :param int depth: (optional) + A filter to limit depth of the application dependencies tree traversal. + Additionally query parameters such as \"cvssV2GreaterThanOrEqual\", \"cvssV3GreaterThanOrEqual\", \"gav\" and \"vulnerabilityId\" can't be used in conjunction with this latter. :param str gav: (optional) A filter to return only resources that match the entire GAV (Group Artifact Version) identifier given. @@ -1201,6 +1212,8 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** "page", "sort_order", "sort_by", + "root_node_id", + "depth", "gav", "opc_request_id" ] @@ -1227,7 +1240,7 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** ) if 'sort_by' in kwargs: - sort_by_allowed_values = ["gav", "nodeId"] + sort_by_allowed_values = ["gav", "nodeId", "dfs", "bfs"] if kwargs['sort_by'] not in sort_by_allowed_values: raise ValueError( "Invalid value for `sort_by`, must be one of {0}".format(sort_by_allowed_values) @@ -1241,6 +1254,8 @@ def list_application_dependency_vulnerabilities(self, vulnerability_audit_id, ** "page": kwargs.get("page", missing), "sortOrder": kwargs.get("sort_order", missing), "sortBy": kwargs.get("sort_by", missing), + "rootNodeId": kwargs.get("root_node_id", missing), + "depth": kwargs.get("depth", missing), "gav": kwargs.get("gav", missing) } query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} @@ -1483,10 +1498,13 @@ def list_vulnerability_audits(self, **kwargs): The field used to sort Vulnerability Audits. Only one sort order is allowed. Default order for _maxObservedCvssV2Score_ is **ascending**. Default order for _maxObservedCvssV3Score_ is **ascending**. + Default order for _maxObservedCvssV2ScoreWithIgnored_ is **ascending**. + Default order for _maxObservedCvssV3ScoreWithIgnored_ is **ascending**. Default order for _timeCreated_ is **descending**. Default order for _vulnerableArtifactsCount_ is **ascending**. + Default order for _vulnerableArtifactsCountWithIgnored_ is **ascending**. - Allowed values are: "maxObservedCvssV2Score", "maxObservedCvssV3Score", "timeCreated", "vulnerableArtifactsCount" + Allowed values are: "maxObservedCvssV2Score", "maxObservedCvssV3Score", "timeCreated", "vulnerableArtifactsCount", "maxObservedCvssV2ScoreWithIgnored", "maxObservedCvssV3ScoreWithIgnored", "vulnerableArtifactsCountWithIgnored" :param str display_name: (optional) A filter to return only resources that match the entire display name given. @@ -1550,7 +1568,7 @@ def list_vulnerability_audits(self, **kwargs): ) if 'sort_by' in kwargs: - sort_by_allowed_values = ["maxObservedCvssV2Score", "maxObservedCvssV3Score", "timeCreated", "vulnerableArtifactsCount"] + sort_by_allowed_values = ["maxObservedCvssV2Score", "maxObservedCvssV3Score", "timeCreated", "vulnerableArtifactsCount", "maxObservedCvssV2ScoreWithIgnored", "maxObservedCvssV3ScoreWithIgnored", "vulnerableArtifactsCountWithIgnored"] if kwargs['sort_by'] not in sort_by_allowed_values: raise ValueError( "Invalid value for `sort_by`, must be one of {0}".format(sort_by_allowed_values) diff --git a/src/oci/adm/models/__init__.py b/src/oci/adm/models/__init__.py index 50d45ee317..cde8a419fa 100644 --- a/src/oci/adm/models/__init__.py +++ b/src/oci/adm/models/__init__.py @@ -11,15 +11,19 @@ from .change_vulnerability_audit_compartment_details import ChangeVulnerabilityAuditCompartmentDetails from .create_knowledge_base_details import CreateKnowledgeBaseDetails from .create_vulnerability_audit_details import CreateVulnerabilityAuditDetails +from .external_resource_vulnerability_audit_source import ExternalResourceVulnerabilityAuditSource from .knowledge_base import KnowledgeBase from .knowledge_base_collection import KnowledgeBaseCollection from .knowledge_base_summary import KnowledgeBaseSummary +from .oci_resource_vulnerability_audit_source import OciResourceVulnerabilityAuditSource +from .unknown_source_vulnerability_audit_source import UnknownSourceVulnerabilityAuditSource from .update_knowledge_base_details import UpdateKnowledgeBaseDetails from .update_vulnerability_audit_details import UpdateVulnerabilityAuditDetails from .vulnerability import Vulnerability from .vulnerability_audit import VulnerabilityAudit from .vulnerability_audit_collection import VulnerabilityAuditCollection from .vulnerability_audit_configuration import VulnerabilityAuditConfiguration +from .vulnerability_audit_source import VulnerabilityAuditSource from .vulnerability_audit_summary import VulnerabilityAuditSummary from .work_request import WorkRequest from .work_request_error import WorkRequestError @@ -39,15 +43,19 @@ "ChangeVulnerabilityAuditCompartmentDetails": ChangeVulnerabilityAuditCompartmentDetails, "CreateKnowledgeBaseDetails": CreateKnowledgeBaseDetails, "CreateVulnerabilityAuditDetails": CreateVulnerabilityAuditDetails, + "ExternalResourceVulnerabilityAuditSource": ExternalResourceVulnerabilityAuditSource, "KnowledgeBase": KnowledgeBase, "KnowledgeBaseCollection": KnowledgeBaseCollection, "KnowledgeBaseSummary": KnowledgeBaseSummary, + "OciResourceVulnerabilityAuditSource": OciResourceVulnerabilityAuditSource, + "UnknownSourceVulnerabilityAuditSource": UnknownSourceVulnerabilityAuditSource, "UpdateKnowledgeBaseDetails": UpdateKnowledgeBaseDetails, "UpdateVulnerabilityAuditDetails": UpdateVulnerabilityAuditDetails, "Vulnerability": Vulnerability, "VulnerabilityAudit": VulnerabilityAudit, "VulnerabilityAuditCollection": VulnerabilityAuditCollection, "VulnerabilityAuditConfiguration": VulnerabilityAuditConfiguration, + "VulnerabilityAuditSource": VulnerabilityAuditSource, "VulnerabilityAuditSummary": VulnerabilityAuditSummary, "WorkRequest": WorkRequest, "WorkRequestError": WorkRequestError, diff --git a/src/oci/adm/models/application_dependency.py b/src/oci/adm/models/application_dependency.py index 41703d7836..361888f56e 100644 --- a/src/oci/adm/models/application_dependency.py +++ b/src/oci/adm/models/application_dependency.py @@ -51,7 +51,7 @@ def __init__(self, **kwargs): def gav(self): """ **[Required]** Gets the gav of this ApplicationDependency. - Unique Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. + Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. :return: The gav of this ApplicationDependency. @@ -63,7 +63,7 @@ def gav(self): def gav(self, gav): """ Sets the gav of this ApplicationDependency. - Unique Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. + Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. :param gav: The gav of this ApplicationDependency. @@ -75,7 +75,15 @@ def gav(self, gav): def node_id(self): """ **[Required]** Gets the node_id of this ApplicationDependency. - Unique identifier of an Application Dependency node, e.g. nodeId1. + Unique identifier of an Application Dependency, for example nodeId1. + The nodeId can be generated by assigning a unique id to each application dependency + in the tree of application dependencies. + Every node, even those who share the same GAV, should have a different nodeId. + The preferred way of constructing a nodeId is to assign incremental integers + during a breadth first or depth first search. + A nodeId can be reused only it refers to the same subtree of application dependencies. + (This is not equivalent to referring to the same GAV, that is, + a GAV can have multiple transitive dependencies.) :return: The node_id of this ApplicationDependency. @@ -87,7 +95,15 @@ def node_id(self): def node_id(self, node_id): """ Sets the node_id of this ApplicationDependency. - Unique identifier of an Application Dependency node, e.g. nodeId1. + Unique identifier of an Application Dependency, for example nodeId1. + The nodeId can be generated by assigning a unique id to each application dependency + in the tree of application dependencies. + Every node, even those who share the same GAV, should have a different nodeId. + The preferred way of constructing a nodeId is to assign incremental integers + during a breadth first or depth first search. + A nodeId can be reused only it refers to the same subtree of application dependencies. + (This is not equivalent to referring to the same GAV, that is, + a GAV can have multiple transitive dependencies.) :param node_id: The node_id of this ApplicationDependency. @@ -98,8 +114,8 @@ def node_id(self, node_id): @property def application_dependency_node_ids(self): """ - **[Required]** Gets the application_dependency_node_ids of this ApplicationDependency. - List of (Application Dependencies) node identifiers on which this node depends. + Gets the application_dependency_node_ids of this ApplicationDependency. + List of Application Dependencies on which this Application Dependency depends, each identified by its nodeId. :return: The application_dependency_node_ids of this ApplicationDependency. @@ -111,7 +127,7 @@ def application_dependency_node_ids(self): def application_dependency_node_ids(self, application_dependency_node_ids): """ Sets the application_dependency_node_ids of this ApplicationDependency. - List of (Application Dependencies) node identifiers on which this node depends. + List of Application Dependencies on which this Application Dependency depends, each identified by its nodeId. :param application_dependency_node_ids: The application_dependency_node_ids of this ApplicationDependency. diff --git a/src/oci/adm/models/application_dependency_vulnerability_collection.py b/src/oci/adm/models/application_dependency_vulnerability_collection.py index 2a49a649dc..178cd08905 100644 --- a/src/oci/adm/models/application_dependency_vulnerability_collection.py +++ b/src/oci/adm/models/application_dependency_vulnerability_collection.py @@ -11,7 +11,7 @@ class ApplicationDependencyVulnerabilityCollection(object): """ Application Dependencies with Vulnerabilities. - This resource is defined by a list of Application Dependencies with are associated with eventual Vulnerabilities. + This resource is defined by a list of Application Dependencies that are associated with eventual Vulnerabilities. """ def __init__(self, **kwargs): diff --git a/src/oci/adm/models/application_dependency_vulnerability_summary.py b/src/oci/adm/models/application_dependency_vulnerability_summary.py index eda4e50d39..5416976a2e 100644 --- a/src/oci/adm/models/application_dependency_vulnerability_summary.py +++ b/src/oci/adm/models/application_dependency_vulnerability_summary.py @@ -10,9 +10,9 @@ @init_model_state_from_kwargs class ApplicationDependencyVulnerabilitySummary(object): """ - An Application Dependency Vulnerability represents a single dependency in our application. + An Application Dependency Vulnerability represents a single dependency in the application. An Application Dependency Vulnerability can be associated with eventual Vulnerabilities. - Each Application Dependency is uniquely defined by a nodeId and lists eventual dependencies that this element depends on. + Each Application Dependency is uniquely defined by a nodeId and lists eventual dependencies on which it depends. """ def __init__(self, **kwargs): @@ -67,7 +67,7 @@ def __init__(self, **kwargs): def gav(self): """ **[Required]** Gets the gav of this ApplicationDependencyVulnerabilitySummary. - Unique Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. + Group Artifact Version (GAV) identifier (Group:Artifact:Version), for example org.graalvm.nativeimage:svm:21.1.0. :return: The gav of this ApplicationDependencyVulnerabilitySummary. @@ -79,7 +79,7 @@ def gav(self): def gav(self, gav): """ Sets the gav of this ApplicationDependencyVulnerabilitySummary. - Unique Group Artifact Version (GAV) identifier (Group:Artifact:Version), e.g. org.graalvm.nativeimage:svm:21.1.0. + Group Artifact Version (GAV) identifier (Group:Artifact:Version), for example org.graalvm.nativeimage:svm:21.1.0. :param gav: The gav of this ApplicationDependencyVulnerabilitySummary. @@ -91,7 +91,7 @@ def gav(self, gav): def node_id(self): """ **[Required]** Gets the node_id of this ApplicationDependencyVulnerabilitySummary. - Unique identifier of an Application Dependency node, e.g. nodeId1. + Unique identifier of an Application Dependency, for example nodeId1. :return: The node_id of this ApplicationDependencyVulnerabilitySummary. @@ -103,7 +103,7 @@ def node_id(self): def node_id(self, node_id): """ Sets the node_id of this ApplicationDependencyVulnerabilitySummary. - Unique identifier of an Application Dependency node, e.g. nodeId1. + Unique identifier of an Application Dependency, for example nodeId1. :param node_id: The node_id of this ApplicationDependencyVulnerabilitySummary. @@ -115,7 +115,7 @@ def node_id(self, node_id): def application_dependency_node_ids(self): """ **[Required]** Gets the application_dependency_node_ids of this ApplicationDependencyVulnerabilitySummary. - List of (Application Dependencies) node identifiers on which this node depends. + List of Application Dependencies on which this Application Dependency depends, each identified by its nodeId. :return: The application_dependency_node_ids of this ApplicationDependencyVulnerabilitySummary. @@ -127,7 +127,7 @@ def application_dependency_node_ids(self): def application_dependency_node_ids(self, application_dependency_node_ids): """ Sets the application_dependency_node_ids of this ApplicationDependencyVulnerabilitySummary. - List of (Application Dependencies) node identifiers on which this node depends. + List of Application Dependencies on which this Application Dependency depends, each identified by its nodeId. :param application_dependency_node_ids: The application_dependency_node_ids of this ApplicationDependencyVulnerabilitySummary. diff --git a/src/oci/adm/models/create_vulnerability_audit_details.py b/src/oci/adm/models/create_vulnerability_audit_details.py index 02098e31d7..d7ff553037 100644 --- a/src/oci/adm/models/create_vulnerability_audit_details.py +++ b/src/oci/adm/models/create_vulnerability_audit_details.py @@ -42,6 +42,10 @@ def __init__(self, **kwargs): The value to assign to the display_name property of this CreateVulnerabilityAuditDetails. :type display_name: str + :param source: + The value to assign to the source property of this CreateVulnerabilityAuditDetails. + :type source: oci.adm.models.VulnerabilityAuditSource + :param freeform_tags: The value to assign to the freeform_tags property of this CreateVulnerabilityAuditDetails. :type freeform_tags: dict(str, str) @@ -58,6 +62,7 @@ def __init__(self, **kwargs): 'build_type': 'str', 'configuration': 'VulnerabilityAuditConfiguration', 'display_name': 'str', + 'source': 'VulnerabilityAuditSource', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))' } @@ -69,6 +74,7 @@ def __init__(self, **kwargs): 'build_type': 'buildType', 'configuration': 'configuration', 'display_name': 'displayName', + 'source': 'source', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags' } @@ -79,6 +85,7 @@ def __init__(self, **kwargs): self._build_type = None self._configuration = None self._display_name = None + self._source = None self._freeform_tags = None self._defined_tags = None @@ -113,8 +120,9 @@ def knowledge_base_id(self, knowledge_base_id): @property def compartment_id(self): """ - **[Required]** Gets the compartment_id of this CreateVulnerabilityAuditDetails. + Gets the compartment_id of this CreateVulnerabilityAuditDetails. The Oracle Cloud identifier (`OCID`__) of the compartment associated with the Vulnerability Audit. + If compartment identifier is not provided the compartment of the associated Knowledge Base will be used instead. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -129,6 +137,7 @@ def compartment_id(self, compartment_id): """ Sets the compartment_id of this CreateVulnerabilityAuditDetails. The Oracle Cloud identifier (`OCID`__) of the compartment associated with the Vulnerability Audit. + If compartment identifier is not provided the compartment of the associated Knowledge Base will be used instead. __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm @@ -141,7 +150,7 @@ def compartment_id(self, compartment_id): @property def application_dependencies(self): """ - **[Required]** Gets the application_dependencies of this CreateVulnerabilityAuditDetails. + Gets the application_dependencies of this CreateVulnerabilityAuditDetails. List of Application Dependencies (without vulnerabilities). @@ -230,6 +239,26 @@ def display_name(self, display_name): """ self._display_name = display_name + @property + def source(self): + """ + Gets the source of this CreateVulnerabilityAuditDetails. + + :return: The source of this CreateVulnerabilityAuditDetails. + :rtype: oci.adm.models.VulnerabilityAuditSource + """ + return self._source + + @source.setter + def source(self, source): + """ + Sets the source of this CreateVulnerabilityAuditDetails. + + :param source: The source of this CreateVulnerabilityAuditDetails. + :type: oci.adm.models.VulnerabilityAuditSource + """ + self._source = source + @property def freeform_tags(self): """ diff --git a/src/oci/adm/models/external_resource_vulnerability_audit_source.py b/src/oci/adm/models/external_resource_vulnerability_audit_source.py new file mode 100644 index 0000000000..5cd939f1b6 --- /dev/null +++ b/src/oci/adm/models/external_resource_vulnerability_audit_source.py @@ -0,0 +1,80 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .vulnerability_audit_source import VulnerabilityAuditSource +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ExternalResourceVulnerabilityAuditSource(VulnerabilityAuditSource): + """ + External source for the Vulnerability Audit. + """ + + def __init__(self, **kwargs): + """ + Initializes a new ExternalResourceVulnerabilityAuditSource object with values from keyword arguments. The default value of the :py:attr:`~oci.adm.models.ExternalResourceVulnerabilityAuditSource.type` attribute + of this class is ``EXTERNAL_RESOURCE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this ExternalResourceVulnerabilityAuditSource. + Allowed values for this property are: "EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN" + :type type: str + + :param description: + The value to assign to the description property of this ExternalResourceVulnerabilityAuditSource. + :type description: str + + """ + self.swagger_types = { + 'type': 'str', + 'description': 'str' + } + + self.attribute_map = { + 'type': 'type', + 'description': 'description' + } + + self._type = None + self._description = None + self._type = 'EXTERNAL_RESOURCE' + + @property + def description(self): + """ + Gets the description of this ExternalResourceVulnerabilityAuditSource. + Description of the external resource source. + + + :return: The description of this ExternalResourceVulnerabilityAuditSource. + :rtype: str + """ + return self._description + + @description.setter + def description(self, description): + """ + Sets the description of this ExternalResourceVulnerabilityAuditSource. + Description of the external resource source. + + + :param description: The description of this ExternalResourceVulnerabilityAuditSource. + :type: str + """ + self._description = description + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/adm/models/oci_resource_vulnerability_audit_source.py b/src/oci/adm/models/oci_resource_vulnerability_audit_source.py new file mode 100644 index 0000000000..62739e21f0 --- /dev/null +++ b/src/oci/adm/models/oci_resource_vulnerability_audit_source.py @@ -0,0 +1,84 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .vulnerability_audit_source import VulnerabilityAuditSource +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class OciResourceVulnerabilityAuditSource(VulnerabilityAuditSource): + """ + OCI resource source for the Vulnerability Audit. + """ + + def __init__(self, **kwargs): + """ + Initializes a new OciResourceVulnerabilityAuditSource object with values from keyword arguments. The default value of the :py:attr:`~oci.adm.models.OciResourceVulnerabilityAuditSource.type` attribute + of this class is ``OCI_RESOURCE`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this OciResourceVulnerabilityAuditSource. + Allowed values for this property are: "EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN" + :type type: str + + :param oci_resource_id: + The value to assign to the oci_resource_id property of this OciResourceVulnerabilityAuditSource. + :type oci_resource_id: str + + """ + self.swagger_types = { + 'type': 'str', + 'oci_resource_id': 'str' + } + + self.attribute_map = { + 'type': 'type', + 'oci_resource_id': 'ociResourceId' + } + + self._type = None + self._oci_resource_id = None + self._type = 'OCI_RESOURCE' + + @property + def oci_resource_id(self): + """ + **[Required]** Gets the oci_resource_id of this OciResourceVulnerabilityAuditSource. + The Oracle Cloud identifier (`OCID`__) of the OCI resource that triggered the Vulnerability Audit. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The oci_resource_id of this OciResourceVulnerabilityAuditSource. + :rtype: str + """ + return self._oci_resource_id + + @oci_resource_id.setter + def oci_resource_id(self, oci_resource_id): + """ + Sets the oci_resource_id of this OciResourceVulnerabilityAuditSource. + The Oracle Cloud identifier (`OCID`__) of the OCI resource that triggered the Vulnerability Audit. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param oci_resource_id: The oci_resource_id of this OciResourceVulnerabilityAuditSource. + :type: str + """ + self._oci_resource_id = oci_resource_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/adm/models/unknown_source_vulnerability_audit_source.py b/src/oci/adm/models/unknown_source_vulnerability_audit_source.py new file mode 100644 index 0000000000..bf241912c2 --- /dev/null +++ b/src/oci/adm/models/unknown_source_vulnerability_audit_source.py @@ -0,0 +1,49 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .vulnerability_audit_source import VulnerabilityAuditSource +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class UnknownSourceVulnerabilityAuditSource(VulnerabilityAuditSource): + """ + Unknown source for Vulnerability Audit. + """ + + def __init__(self, **kwargs): + """ + Initializes a new UnknownSourceVulnerabilityAuditSource object with values from keyword arguments. The default value of the :py:attr:`~oci.adm.models.UnknownSourceVulnerabilityAuditSource.type` attribute + of this class is ``UNKNOWN`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this UnknownSourceVulnerabilityAuditSource. + Allowed values for this property are: "EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN" + :type type: str + + """ + self.swagger_types = { + 'type': 'str' + } + + self.attribute_map = { + 'type': 'type' + } + + self._type = None + self._type = 'UNKNOWN' + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/adm/models/vulnerability_audit.py b/src/oci/adm/models/vulnerability_audit.py index f48696008e..c2155eff31 100644 --- a/src/oci/adm/models/vulnerability_audit.py +++ b/src/oci/adm/models/vulnerability_audit.py @@ -10,8 +10,10 @@ @init_model_state_from_kwargs class VulnerabilityAudit(object): """ - A Vulnerability Audit associates the Application Dependencies of a project with their associated vulnerabilities. + A Vulnerability Audit associates the Application Dependencies of a project with their associated Vulnerabilities. Each Vulnerability is associated with a score (Common Vulnerability Scoring System V2 or V3). + A vulnerable Application Dependency can be ignored based on the configuration of the Vulnerability Audit. + maxObservedCvssV2Score, maxObservedCvssV3Score and vulnerableArtifactsCount do not take into account non-vulnerable Application Dependency. """ #: A constant which can be used with the lifecycle_state property of a VulnerabilityAudit. @@ -81,6 +83,18 @@ def __init__(self, **kwargs): The value to assign to the max_observed_cvss_v3_score property of this VulnerabilityAudit. :type max_observed_cvss_v3_score: float + :param max_observed_cvss_v2_score_with_ignored: + The value to assign to the max_observed_cvss_v2_score_with_ignored property of this VulnerabilityAudit. + :type max_observed_cvss_v2_score_with_ignored: float + + :param max_observed_cvss_v3_score_with_ignored: + The value to assign to the max_observed_cvss_v3_score_with_ignored property of this VulnerabilityAudit. + :type max_observed_cvss_v3_score_with_ignored: float + + :param vulnerable_artifacts_count_with_ignored: + The value to assign to the vulnerable_artifacts_count_with_ignored property of this VulnerabilityAudit. + :type vulnerable_artifacts_count_with_ignored: int + :param vulnerable_artifacts_count: The value to assign to the vulnerable_artifacts_count property of this VulnerabilityAudit. :type vulnerable_artifacts_count: int @@ -99,6 +113,10 @@ def __init__(self, **kwargs): Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type build_type: str + :param source: + The value to assign to the source property of this VulnerabilityAudit. + :type source: oci.adm.models.VulnerabilityAuditSource + :param compartment_id: The value to assign to the compartment_id property of this VulnerabilityAudit. :type compartment_id: str @@ -126,10 +144,14 @@ def __init__(self, **kwargs): 'vulnerabilities': 'list[Vulnerability]', 'max_observed_cvss_v2_score': 'float', 'max_observed_cvss_v3_score': 'float', + 'max_observed_cvss_v2_score_with_ignored': 'float', + 'max_observed_cvss_v3_score_with_ignored': 'float', + 'vulnerable_artifacts_count_with_ignored': 'int', 'vulnerable_artifacts_count': 'int', 'configuration': 'VulnerabilityAuditConfiguration', 'is_success': 'bool', 'build_type': 'str', + 'source': 'VulnerabilityAuditSource', 'compartment_id': 'str', 'freeform_tags': 'dict(str, str)', 'defined_tags': 'dict(str, dict(str, object))', @@ -146,10 +168,14 @@ def __init__(self, **kwargs): 'vulnerabilities': 'vulnerabilities', 'max_observed_cvss_v2_score': 'maxObservedCvssV2Score', 'max_observed_cvss_v3_score': 'maxObservedCvssV3Score', + 'max_observed_cvss_v2_score_with_ignored': 'maxObservedCvssV2ScoreWithIgnored', + 'max_observed_cvss_v3_score_with_ignored': 'maxObservedCvssV3ScoreWithIgnored', + 'vulnerable_artifacts_count_with_ignored': 'vulnerableArtifactsCountWithIgnored', 'vulnerable_artifacts_count': 'vulnerableArtifactsCount', 'configuration': 'configuration', 'is_success': 'isSuccess', 'build_type': 'buildType', + 'source': 'source', 'compartment_id': 'compartmentId', 'freeform_tags': 'freeformTags', 'defined_tags': 'definedTags', @@ -165,10 +191,14 @@ def __init__(self, **kwargs): self._vulnerabilities = None self._max_observed_cvss_v2_score = None self._max_observed_cvss_v3_score = None + self._max_observed_cvss_v2_score_with_ignored = None + self._max_observed_cvss_v3_score_with_ignored = None + self._vulnerable_artifacts_count_with_ignored = None self._vulnerable_artifacts_count = None self._configuration = None self._is_success = None self._build_type = None + self._source = None self._compartment_id = None self._freeform_tags = None self._defined_tags = None @@ -368,7 +398,7 @@ def vulnerabilities(self, vulnerabilities): def max_observed_cvss_v2_score(self): """ **[Required]** Gets the max_observed_cvss_v2_score of this VulnerabilityAudit. - Maximum Common Vulnerability Scoring System Version 2 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 2 score observed for non-ignored vulnerable Application Dependencies. :return: The max_observed_cvss_v2_score of this VulnerabilityAudit. @@ -380,7 +410,7 @@ def max_observed_cvss_v2_score(self): def max_observed_cvss_v2_score(self, max_observed_cvss_v2_score): """ Sets the max_observed_cvss_v2_score of this VulnerabilityAudit. - Maximum Common Vulnerability Scoring System Version 2 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 2 score observed for non-ignored vulnerable Application Dependencies. :param max_observed_cvss_v2_score: The max_observed_cvss_v2_score of this VulnerabilityAudit. @@ -392,7 +422,7 @@ def max_observed_cvss_v2_score(self, max_observed_cvss_v2_score): def max_observed_cvss_v3_score(self): """ **[Required]** Gets the max_observed_cvss_v3_score of this VulnerabilityAudit. - Maximum Common Vulnerability Scoring System Version 3 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 3 score observed for non-ignored vulnerable Application Dependencies. :return: The max_observed_cvss_v3_score of this VulnerabilityAudit. @@ -404,7 +434,7 @@ def max_observed_cvss_v3_score(self): def max_observed_cvss_v3_score(self, max_observed_cvss_v3_score): """ Sets the max_observed_cvss_v3_score of this VulnerabilityAudit. - Maximum Common Vulnerability Scoring System Version 3 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 3 score observed for non-ignored vulnerable Application Dependencies. :param max_observed_cvss_v3_score: The max_observed_cvss_v3_score of this VulnerabilityAudit. @@ -412,11 +442,83 @@ def max_observed_cvss_v3_score(self, max_observed_cvss_v3_score): """ self._max_observed_cvss_v3_score = max_observed_cvss_v3_score + @property + def max_observed_cvss_v2_score_with_ignored(self): + """ + **[Required]** Gets the max_observed_cvss_v2_score_with_ignored of this VulnerabilityAudit. + Maximum Common Vulnerability Scoring System Version 2 score observed for vulnerable Application Dependencies including ignored ones. + + + :return: The max_observed_cvss_v2_score_with_ignored of this VulnerabilityAudit. + :rtype: float + """ + return self._max_observed_cvss_v2_score_with_ignored + + @max_observed_cvss_v2_score_with_ignored.setter + def max_observed_cvss_v2_score_with_ignored(self, max_observed_cvss_v2_score_with_ignored): + """ + Sets the max_observed_cvss_v2_score_with_ignored of this VulnerabilityAudit. + Maximum Common Vulnerability Scoring System Version 2 score observed for vulnerable Application Dependencies including ignored ones. + + + :param max_observed_cvss_v2_score_with_ignored: The max_observed_cvss_v2_score_with_ignored of this VulnerabilityAudit. + :type: float + """ + self._max_observed_cvss_v2_score_with_ignored = max_observed_cvss_v2_score_with_ignored + + @property + def max_observed_cvss_v3_score_with_ignored(self): + """ + **[Required]** Gets the max_observed_cvss_v3_score_with_ignored of this VulnerabilityAudit. + Maximum Common Vulnerability Scoring System Version 3 score observed for vulnerable Application Dependencies including ignored ones. + + + :return: The max_observed_cvss_v3_score_with_ignored of this VulnerabilityAudit. + :rtype: float + """ + return self._max_observed_cvss_v3_score_with_ignored + + @max_observed_cvss_v3_score_with_ignored.setter + def max_observed_cvss_v3_score_with_ignored(self, max_observed_cvss_v3_score_with_ignored): + """ + Sets the max_observed_cvss_v3_score_with_ignored of this VulnerabilityAudit. + Maximum Common Vulnerability Scoring System Version 3 score observed for vulnerable Application Dependencies including ignored ones. + + + :param max_observed_cvss_v3_score_with_ignored: The max_observed_cvss_v3_score_with_ignored of this VulnerabilityAudit. + :type: float + """ + self._max_observed_cvss_v3_score_with_ignored = max_observed_cvss_v3_score_with_ignored + + @property + def vulnerable_artifacts_count_with_ignored(self): + """ + **[Required]** Gets the vulnerable_artifacts_count_with_ignored of this VulnerabilityAudit. + Count of all vulnerable Application Dependencies. + + + :return: The vulnerable_artifacts_count_with_ignored of this VulnerabilityAudit. + :rtype: int + """ + return self._vulnerable_artifacts_count_with_ignored + + @vulnerable_artifacts_count_with_ignored.setter + def vulnerable_artifacts_count_with_ignored(self, vulnerable_artifacts_count_with_ignored): + """ + Sets the vulnerable_artifacts_count_with_ignored of this VulnerabilityAudit. + Count of all vulnerable Application Dependencies. + + + :param vulnerable_artifacts_count_with_ignored: The vulnerable_artifacts_count_with_ignored of this VulnerabilityAudit. + :type: int + """ + self._vulnerable_artifacts_count_with_ignored = vulnerable_artifacts_count_with_ignored + @property def vulnerable_artifacts_count(self): """ **[Required]** Gets the vulnerable_artifacts_count of this VulnerabilityAudit. - Count of vulnerable artifacts. + Count of non-ignored vulnerable Application Dependencies. :return: The vulnerable_artifacts_count of this VulnerabilityAudit. @@ -428,7 +530,7 @@ def vulnerable_artifacts_count(self): def vulnerable_artifacts_count(self, vulnerable_artifacts_count): """ Sets the vulnerable_artifacts_count of this VulnerabilityAudit. - Count of vulnerable artifacts. + Count of non-ignored vulnerable Application Dependencies. :param vulnerable_artifacts_count: The vulnerable_artifacts_count of this VulnerabilityAudit. @@ -510,6 +612,26 @@ def build_type(self, build_type): build_type = 'UNKNOWN_ENUM_VALUE' self._build_type = build_type + @property + def source(self): + """ + **[Required]** Gets the source of this VulnerabilityAudit. + + :return: The source of this VulnerabilityAudit. + :rtype: oci.adm.models.VulnerabilityAuditSource + """ + return self._source + + @source.setter + def source(self, source): + """ + Sets the source of this VulnerabilityAudit. + + :param source: The source of this VulnerabilityAudit. + :type: oci.adm.models.VulnerabilityAuditSource + """ + self._source = source + @property def compartment_id(self): """ diff --git a/src/oci/adm/models/vulnerability_audit_configuration.py b/src/oci/adm/models/vulnerability_audit_configuration.py index 1544de4122..6b9dd614b9 100644 --- a/src/oci/adm/models/vulnerability_audit_configuration.py +++ b/src/oci/adm/models/vulnerability_audit_configuration.py @@ -10,7 +10,8 @@ @init_model_state_from_kwargs class VulnerabilityAuditConfiguration(object): """ - Configuration for a Vulnerability Audit + Configuration for a Vulnerability Audit. + A vulnerable Application Dependency is ignored if its name does match any of the items in `exclusions`, or all of the associated Vulnerabilies have a CVSS v2 score below `maxPermissibleCvssV2Score` and a CVSS v3 score below `maxPermissibleCvssV3Score`. type: object """ @@ -52,7 +53,7 @@ def __init__(self, **kwargs): def max_permissible_cvss_v2_score(self): """ Gets the max_permissible_cvss_v2_score of this VulnerabilityAuditConfiguration. - The minimum CVSS V2 score for a vulnerability to be considered by the audit as failed. + A vulnerable Application Dependency is ignored if the score of its associated Vulnerability is below maxPermissibleCvssV2Score and below maxPermissibleCvssV3Score. :return: The max_permissible_cvss_v2_score of this VulnerabilityAuditConfiguration. @@ -64,7 +65,7 @@ def max_permissible_cvss_v2_score(self): def max_permissible_cvss_v2_score(self, max_permissible_cvss_v2_score): """ Sets the max_permissible_cvss_v2_score of this VulnerabilityAuditConfiguration. - The minimum CVSS V2 score for a vulnerability to be considered by the audit as failed. + A vulnerable Application Dependency is ignored if the score of its associated Vulnerability is below maxPermissibleCvssV2Score and below maxPermissibleCvssV3Score. :param max_permissible_cvss_v2_score: The max_permissible_cvss_v2_score of this VulnerabilityAuditConfiguration. @@ -76,7 +77,7 @@ def max_permissible_cvss_v2_score(self, max_permissible_cvss_v2_score): def max_permissible_cvss_v3_score(self): """ Gets the max_permissible_cvss_v3_score of this VulnerabilityAuditConfiguration. - The minimum CVSS V3 score for a vulnerability to be considered by the audit as failed. + A vulnerable Application Dependency is ignored if the score of its associated Vulnerability is below maxPermissibleCvssV2Score and below maxPermissibleCvssV3Score. :return: The max_permissible_cvss_v3_score of this VulnerabilityAuditConfiguration. @@ -88,7 +89,7 @@ def max_permissible_cvss_v3_score(self): def max_permissible_cvss_v3_score(self, max_permissible_cvss_v3_score): """ Sets the max_permissible_cvss_v3_score of this VulnerabilityAuditConfiguration. - The minimum CVSS V3 score for a vulnerability to be considered by the audit as failed. + A vulnerable Application Dependency is ignored if the score of its associated Vulnerability is below maxPermissibleCvssV2Score and below maxPermissibleCvssV3Score. :param max_permissible_cvss_v3_score: The max_permissible_cvss_v3_score of this VulnerabilityAuditConfiguration. @@ -100,7 +101,7 @@ def max_permissible_cvss_v3_score(self, max_permissible_cvss_v3_score): def exclusions(self): """ Gets the exclusions of this VulnerabilityAuditConfiguration. - Pattern to exclude artifacts from audit. + A vulnerable Application Dependency is ignored if its name matches any of the items in `exclusions`. :return: The exclusions of this VulnerabilityAuditConfiguration. @@ -112,7 +113,7 @@ def exclusions(self): def exclusions(self, exclusions): """ Sets the exclusions of this VulnerabilityAuditConfiguration. - Pattern to exclude artifacts from audit. + A vulnerable Application Dependency is ignored if its name matches any of the items in `exclusions`. :param exclusions: The exclusions of this VulnerabilityAuditConfiguration. diff --git a/src/oci/adm/models/vulnerability_audit_source.py b/src/oci/adm/models/vulnerability_audit_source.py new file mode 100644 index 0000000000..5786bda24c --- /dev/null +++ b/src/oci/adm/models/vulnerability_audit_source.py @@ -0,0 +1,115 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class VulnerabilityAuditSource(object): + """ + Vulnerability Audit source. + """ + + #: A constant which can be used with the type property of a VulnerabilityAuditSource. + #: This constant has a value of "EXTERNAL_RESOURCE" + TYPE_EXTERNAL_RESOURCE = "EXTERNAL_RESOURCE" + + #: A constant which can be used with the type property of a VulnerabilityAuditSource. + #: This constant has a value of "OCI_RESOURCE" + TYPE_OCI_RESOURCE = "OCI_RESOURCE" + + #: A constant which can be used with the type property of a VulnerabilityAuditSource. + #: This constant has a value of "UNKNOWN" + TYPE_UNKNOWN = "UNKNOWN" + + def __init__(self, **kwargs): + """ + Initializes a new VulnerabilityAuditSource object with values from keyword arguments. This class has the following subclasses and if you are using this class as input + to a service operations then you should favor using a subclass over the base class: + + * :class:`~oci.adm.models.UnknownSourceVulnerabilityAuditSource` + * :class:`~oci.adm.models.OciResourceVulnerabilityAuditSource` + * :class:`~oci.adm.models.ExternalResourceVulnerabilityAuditSource` + + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param type: + The value to assign to the type property of this VulnerabilityAuditSource. + Allowed values for this property are: "EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type type: str + + """ + self.swagger_types = { + 'type': 'str' + } + + self.attribute_map = { + 'type': 'type' + } + + self._type = None + + @staticmethod + def get_subtype(object_dictionary): + """ + Given the hash representation of a subtype of this class, + use the info in the hash to return the class of the subtype. + """ + type = object_dictionary['type'] + + if type == 'UNKNOWN': + return 'UnknownSourceVulnerabilityAuditSource' + + if type == 'OCI_RESOURCE': + return 'OciResourceVulnerabilityAuditSource' + + if type == 'EXTERNAL_RESOURCE': + return 'ExternalResourceVulnerabilityAuditSource' + else: + return 'VulnerabilityAuditSource' + + @property + def type(self): + """ + **[Required]** Gets the type of this VulnerabilityAuditSource. + Source type of the Vulnerability Audit. + + Allowed values for this property are: "EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The type of this VulnerabilityAuditSource. + :rtype: str + """ + return self._type + + @type.setter + def type(self, type): + """ + Sets the type of this VulnerabilityAuditSource. + Source type of the Vulnerability Audit. + + + :param type: The type of this VulnerabilityAuditSource. + :type: str + """ + allowed_values = ["EXTERNAL_RESOURCE", "OCI_RESOURCE", "UNKNOWN"] + if not value_allowed_none_or_none_sentinel(type, allowed_values): + type = 'UNKNOWN_ENUM_VALUE' + self._type = type + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/adm/models/vulnerability_audit_summary.py b/src/oci/adm/models/vulnerability_audit_summary.py index 972bbad5c4..c150b9483a 100644 --- a/src/oci/adm/models/vulnerability_audit_summary.py +++ b/src/oci/adm/models/vulnerability_audit_summary.py @@ -54,6 +54,18 @@ def __init__(self, **kwargs): The value to assign to the vulnerable_artifacts_count property of this VulnerabilityAuditSummary. :type vulnerable_artifacts_count: int + :param max_observed_cvss_v2_score_with_ignored: + The value to assign to the max_observed_cvss_v2_score_with_ignored property of this VulnerabilityAuditSummary. + :type max_observed_cvss_v2_score_with_ignored: float + + :param max_observed_cvss_v3_score_with_ignored: + The value to assign to the max_observed_cvss_v3_score_with_ignored property of this VulnerabilityAuditSummary. + :type max_observed_cvss_v3_score_with_ignored: float + + :param vulnerable_artifacts_count_with_ignored: + The value to assign to the vulnerable_artifacts_count_with_ignored property of this VulnerabilityAuditSummary. + :type vulnerable_artifacts_count_with_ignored: int + :param is_success: The value to assign to the is_success property of this VulnerabilityAuditSummary. :type is_success: bool @@ -89,6 +101,9 @@ def __init__(self, **kwargs): 'max_observed_cvss_v2_score': 'float', 'max_observed_cvss_v3_score': 'float', 'vulnerable_artifacts_count': 'int', + 'max_observed_cvss_v2_score_with_ignored': 'float', + 'max_observed_cvss_v3_score_with_ignored': 'float', + 'vulnerable_artifacts_count_with_ignored': 'int', 'is_success': 'bool', 'build_type': 'str', 'compartment_id': 'str', @@ -107,6 +122,9 @@ def __init__(self, **kwargs): 'max_observed_cvss_v2_score': 'maxObservedCvssV2Score', 'max_observed_cvss_v3_score': 'maxObservedCvssV3Score', 'vulnerable_artifacts_count': 'vulnerableArtifactsCount', + 'max_observed_cvss_v2_score_with_ignored': 'maxObservedCvssV2ScoreWithIgnored', + 'max_observed_cvss_v3_score_with_ignored': 'maxObservedCvssV3ScoreWithIgnored', + 'vulnerable_artifacts_count_with_ignored': 'vulnerableArtifactsCountWithIgnored', 'is_success': 'isSuccess', 'build_type': 'buildType', 'compartment_id': 'compartmentId', @@ -124,6 +142,9 @@ def __init__(self, **kwargs): self._max_observed_cvss_v2_score = None self._max_observed_cvss_v3_score = None self._vulnerable_artifacts_count = None + self._max_observed_cvss_v2_score_with_ignored = None + self._max_observed_cvss_v3_score_with_ignored = None + self._vulnerable_artifacts_count_with_ignored = None self._is_success = None self._build_type = None self._compartment_id = None @@ -295,7 +316,7 @@ def lifecycle_state(self, lifecycle_state): def max_observed_cvss_v2_score(self): """ **[Required]** Gets the max_observed_cvss_v2_score of this VulnerabilityAuditSummary. - Maximum Common Vulnerability Scoring System Version 2 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 2 score observed for non-ignored vulnerable Application Dependencies. :return: The max_observed_cvss_v2_score of this VulnerabilityAuditSummary. @@ -307,7 +328,7 @@ def max_observed_cvss_v2_score(self): def max_observed_cvss_v2_score(self, max_observed_cvss_v2_score): """ Sets the max_observed_cvss_v2_score of this VulnerabilityAuditSummary. - Maximum Common Vulnerability Scoring System Version 2 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 2 score observed for non-ignored vulnerable Application Dependencies. :param max_observed_cvss_v2_score: The max_observed_cvss_v2_score of this VulnerabilityAuditSummary. @@ -319,7 +340,7 @@ def max_observed_cvss_v2_score(self, max_observed_cvss_v2_score): def max_observed_cvss_v3_score(self): """ **[Required]** Gets the max_observed_cvss_v3_score of this VulnerabilityAuditSummary. - Maximum Common Vulnerability Scoring System Version 3 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 3 score observed for non-ignored vulnerable Application Dependencies. :return: The max_observed_cvss_v3_score of this VulnerabilityAuditSummary. @@ -331,7 +352,7 @@ def max_observed_cvss_v3_score(self): def max_observed_cvss_v3_score(self, max_observed_cvss_v3_score): """ Sets the max_observed_cvss_v3_score of this VulnerabilityAuditSummary. - Maximum Common Vulnerability Scoring System Version 3 score of vulnerabilities. + Maximum Common Vulnerability Scoring System Version 3 score observed for non-ignored vulnerable Application Dependencies. :param max_observed_cvss_v3_score: The max_observed_cvss_v3_score of this VulnerabilityAuditSummary. @@ -343,7 +364,7 @@ def max_observed_cvss_v3_score(self, max_observed_cvss_v3_score): def vulnerable_artifacts_count(self): """ **[Required]** Gets the vulnerable_artifacts_count of this VulnerabilityAuditSummary. - Count of vulnerable artifacts. + Count of non-ignored vulnerable Application Dependencies. :return: The vulnerable_artifacts_count of this VulnerabilityAuditSummary. @@ -355,7 +376,7 @@ def vulnerable_artifacts_count(self): def vulnerable_artifacts_count(self, vulnerable_artifacts_count): """ Sets the vulnerable_artifacts_count of this VulnerabilityAuditSummary. - Count of vulnerable artifacts. + Count of non-ignored vulnerable Application Dependencies. :param vulnerable_artifacts_count: The vulnerable_artifacts_count of this VulnerabilityAuditSummary. @@ -363,6 +384,78 @@ def vulnerable_artifacts_count(self, vulnerable_artifacts_count): """ self._vulnerable_artifacts_count = vulnerable_artifacts_count + @property + def max_observed_cvss_v2_score_with_ignored(self): + """ + **[Required]** Gets the max_observed_cvss_v2_score_with_ignored of this VulnerabilityAuditSummary. + Maximum Common Vulnerability Scoring System Version 2 score observed for vulnerable Application Dependencies including ignored ones. + + + :return: The max_observed_cvss_v2_score_with_ignored of this VulnerabilityAuditSummary. + :rtype: float + """ + return self._max_observed_cvss_v2_score_with_ignored + + @max_observed_cvss_v2_score_with_ignored.setter + def max_observed_cvss_v2_score_with_ignored(self, max_observed_cvss_v2_score_with_ignored): + """ + Sets the max_observed_cvss_v2_score_with_ignored of this VulnerabilityAuditSummary. + Maximum Common Vulnerability Scoring System Version 2 score observed for vulnerable Application Dependencies including ignored ones. + + + :param max_observed_cvss_v2_score_with_ignored: The max_observed_cvss_v2_score_with_ignored of this VulnerabilityAuditSummary. + :type: float + """ + self._max_observed_cvss_v2_score_with_ignored = max_observed_cvss_v2_score_with_ignored + + @property + def max_observed_cvss_v3_score_with_ignored(self): + """ + **[Required]** Gets the max_observed_cvss_v3_score_with_ignored of this VulnerabilityAuditSummary. + Maximum Common Vulnerability Scoring System Version 3 score observed for vulnerable Application Dependencies including ignored ones. + + + :return: The max_observed_cvss_v3_score_with_ignored of this VulnerabilityAuditSummary. + :rtype: float + """ + return self._max_observed_cvss_v3_score_with_ignored + + @max_observed_cvss_v3_score_with_ignored.setter + def max_observed_cvss_v3_score_with_ignored(self, max_observed_cvss_v3_score_with_ignored): + """ + Sets the max_observed_cvss_v3_score_with_ignored of this VulnerabilityAuditSummary. + Maximum Common Vulnerability Scoring System Version 3 score observed for vulnerable Application Dependencies including ignored ones. + + + :param max_observed_cvss_v3_score_with_ignored: The max_observed_cvss_v3_score_with_ignored of this VulnerabilityAuditSummary. + :type: float + """ + self._max_observed_cvss_v3_score_with_ignored = max_observed_cvss_v3_score_with_ignored + + @property + def vulnerable_artifacts_count_with_ignored(self): + """ + **[Required]** Gets the vulnerable_artifacts_count_with_ignored of this VulnerabilityAuditSummary. + Count of all vulnerable Application Dependencies. + + + :return: The vulnerable_artifacts_count_with_ignored of this VulnerabilityAuditSummary. + :rtype: int + """ + return self._vulnerable_artifacts_count_with_ignored + + @vulnerable_artifacts_count_with_ignored.setter + def vulnerable_artifacts_count_with_ignored(self, vulnerable_artifacts_count_with_ignored): + """ + Sets the vulnerable_artifacts_count_with_ignored of this VulnerabilityAuditSummary. + Count of all vulnerable Application Dependencies. + + + :param vulnerable_artifacts_count_with_ignored: The vulnerable_artifacts_count_with_ignored of this VulnerabilityAuditSummary. + :type: int + """ + self._vulnerable_artifacts_count_with_ignored = vulnerable_artifacts_count_with_ignored + @property def is_success(self): """ diff --git a/src/oci/bds/models/add_worker_nodes_details.py b/src/oci/bds/models/add_worker_nodes_details.py index ac5b0fd3f2..eb561fb9bf 100644 --- a/src/oci/bds/models/add_worker_nodes_details.py +++ b/src/oci/bds/models/add_worker_nodes_details.py @@ -21,6 +21,10 @@ class AddWorkerNodesDetails(object): #: This constant has a value of "COMPUTE_ONLY_WORKER" NODE_TYPE_COMPUTE_ONLY_WORKER = "COMPUTE_ONLY_WORKER" + #: A constant which can be used with the node_type property of a AddWorkerNodesDetails. + #: This constant has a value of "EDGE" + NODE_TYPE_EDGE = "EDGE" + def __init__(self, **kwargs): """ Initializes a new AddWorkerNodesDetails object with values from keyword arguments. @@ -36,7 +40,7 @@ def __init__(self, **kwargs): :param node_type: The value to assign to the node_type property of this AddWorkerNodesDetails. - Allowed values for this property are: "WORKER", "COMPUTE_ONLY_WORKER" + Allowed values for this property are: "WORKER", "COMPUTE_ONLY_WORKER", "EDGE" :type node_type: str :param shape: @@ -131,7 +135,7 @@ def node_type(self): **[Required]** Gets the node_type of this AddWorkerNodesDetails. Worker node types, can either be Worker Data node or Compute only worker node. - Allowed values for this property are: "WORKER", "COMPUTE_ONLY_WORKER" + Allowed values for this property are: "WORKER", "COMPUTE_ONLY_WORKER", "EDGE" :return: The node_type of this AddWorkerNodesDetails. @@ -149,7 +153,7 @@ def node_type(self, node_type): :param node_type: The node_type of this AddWorkerNodesDetails. :type: str """ - allowed_values = ["WORKER", "COMPUTE_ONLY_WORKER"] + allowed_values = ["WORKER", "COMPUTE_ONLY_WORKER", "EDGE"] if not value_allowed_none_or_none_sentinel(node_type, allowed_values): raise ValueError( "Invalid value for `node_type`, must be None or one of {0}" diff --git a/src/oci/bds/models/change_shape_nodes.py b/src/oci/bds/models/change_shape_nodes.py index e98b9dff9c..d315680a81 100644 --- a/src/oci/bds/models/change_shape_nodes.py +++ b/src/oci/bds/models/change_shape_nodes.py @@ -58,6 +58,14 @@ def __init__(self, **kwargs): The value to assign to the cloudsql_shape_config property of this ChangeShapeNodes. :type cloudsql_shape_config: oci.bds.models.ShapeConfigDetails + :param edge: + The value to assign to the edge property of this ChangeShapeNodes. + :type edge: str + + :param edge_shape_config: + The value to assign to the edge_shape_config property of this ChangeShapeNodes. + :type edge_shape_config: oci.bds.models.ShapeConfigDetails + """ self.swagger_types = { 'worker': 'str', @@ -69,7 +77,9 @@ def __init__(self, **kwargs): 'utility': 'str', 'utility_shape_config': 'ShapeConfigDetails', 'cloudsql': 'str', - 'cloudsql_shape_config': 'ShapeConfigDetails' + 'cloudsql_shape_config': 'ShapeConfigDetails', + 'edge': 'str', + 'edge_shape_config': 'ShapeConfigDetails' } self.attribute_map = { @@ -82,7 +92,9 @@ def __init__(self, **kwargs): 'utility': 'utility', 'utility_shape_config': 'utilityShapeConfig', 'cloudsql': 'cloudsql', - 'cloudsql_shape_config': 'cloudsqlShapeConfig' + 'cloudsql_shape_config': 'cloudsqlShapeConfig', + 'edge': 'edge', + 'edge_shape_config': 'edgeShapeConfig' } self._worker = None @@ -95,6 +107,8 @@ def __init__(self, **kwargs): self._utility_shape_config = None self._cloudsql = None self._cloudsql_shape_config = None + self._edge = None + self._edge_shape_config = None @property def worker(self): @@ -316,6 +330,50 @@ def cloudsql_shape_config(self, cloudsql_shape_config): """ self._cloudsql_shape_config = cloudsql_shape_config + @property + def edge(self): + """ + Gets the edge of this ChangeShapeNodes. + Change shape of edge nodes to the desired target shape. Both VM_STANDARD and E4 Flex shapes are allowed here. + + + :return: The edge of this ChangeShapeNodes. + :rtype: str + """ + return self._edge + + @edge.setter + def edge(self, edge): + """ + Sets the edge of this ChangeShapeNodes. + Change shape of edge nodes to the desired target shape. Both VM_STANDARD and E4 Flex shapes are allowed here. + + + :param edge: The edge of this ChangeShapeNodes. + :type: str + """ + self._edge = edge + + @property + def edge_shape_config(self): + """ + Gets the edge_shape_config of this ChangeShapeNodes. + + :return: The edge_shape_config of this ChangeShapeNodes. + :rtype: oci.bds.models.ShapeConfigDetails + """ + return self._edge_shape_config + + @edge_shape_config.setter + def edge_shape_config(self, edge_shape_config): + """ + Sets the edge_shape_config of this ChangeShapeNodes. + + :param edge_shape_config: The edge_shape_config of this ChangeShapeNodes. + :type: oci.bds.models.ShapeConfigDetails + """ + self._edge_shape_config = edge_shape_config + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/data_flow/models/__init__.py b/src/oci/data_flow/models/__init__.py index 3de78ef27c..c6b1fbd6a1 100644 --- a/src/oci/data_flow/models/__init__.py +++ b/src/oci/data_flow/models/__init__.py @@ -22,6 +22,7 @@ from .run import Run from .run_log_summary import RunLogSummary from .run_summary import RunSummary +from .scan import Scan from .shape_config import ShapeConfig from .statement import Statement from .statement_collection import StatementCollection @@ -62,6 +63,7 @@ "Run": Run, "RunLogSummary": RunLogSummary, "RunSummary": RunSummary, + "Scan": Scan, "ShapeConfig": ShapeConfig, "Statement": Statement, "StatementCollection": StatementCollection, diff --git a/src/oci/data_flow/models/create_private_endpoint_details.py b/src/oci/data_flow/models/create_private_endpoint_details.py index d1f3bb8b8b..3fc03d2543 100644 --- a/src/oci/data_flow/models/create_private_endpoint_details.py +++ b/src/oci/data_flow/models/create_private_endpoint_details.py @@ -50,6 +50,10 @@ def __init__(self, **kwargs): The value to assign to the nsg_ids property of this CreatePrivateEndpointDetails. :type nsg_ids: list[str] + :param scan_details: + The value to assign to the scan_details property of this CreatePrivateEndpointDetails. + :type scan_details: list[oci.data_flow.models.Scan] + :param subnet_id: The value to assign to the subnet_id property of this CreatePrivateEndpointDetails. :type subnet_id: str @@ -64,6 +68,7 @@ def __init__(self, **kwargs): 'freeform_tags': 'dict(str, str)', 'max_host_count': 'int', 'nsg_ids': 'list[str]', + 'scan_details': 'list[Scan]', 'subnet_id': 'str' } @@ -76,6 +81,7 @@ def __init__(self, **kwargs): 'freeform_tags': 'freeformTags', 'max_host_count': 'maxHostCount', 'nsg_ids': 'nsgIds', + 'scan_details': 'scanDetails', 'subnet_id': 'subnetId' } @@ -87,6 +93,7 @@ def __init__(self, **kwargs): self._freeform_tags = None self._max_host_count = None self._nsg_ids = None + self._scan_details = None self._subnet_id = None @property @@ -303,6 +310,32 @@ def nsg_ids(self, nsg_ids): """ self._nsg_ids = nsg_ids + @property + def scan_details(self): + """ + Gets the scan_details of this CreatePrivateEndpointDetails. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :return: The scan_details of this CreatePrivateEndpointDetails. + :rtype: list[oci.data_flow.models.Scan] + """ + return self._scan_details + + @scan_details.setter + def scan_details(self, scan_details): + """ + Sets the scan_details of this CreatePrivateEndpointDetails. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :param scan_details: The scan_details of this CreatePrivateEndpointDetails. + :type: list[oci.data_flow.models.Scan] + """ + self._scan_details = scan_details + @property def subnet_id(self): """ diff --git a/src/oci/data_flow/models/private_endpoint.py b/src/oci/data_flow/models/private_endpoint.py index 92731ab0ec..90d9584736 100644 --- a/src/oci/data_flow/models/private_endpoint.py +++ b/src/oci/data_flow/models/private_endpoint.py @@ -100,6 +100,10 @@ def __init__(self, **kwargs): The value to assign to the owner_user_name property of this PrivateEndpoint. :type owner_user_name: str + :param scan_details: + The value to assign to the scan_details property of this PrivateEndpoint. + :type scan_details: list[oci.data_flow.models.Scan] + :param subnet_id: The value to assign to the subnet_id property of this PrivateEndpoint. :type subnet_id: str @@ -127,6 +131,7 @@ def __init__(self, **kwargs): 'nsg_ids': 'list[str]', 'owner_principal_id': 'str', 'owner_user_name': 'str', + 'scan_details': 'list[Scan]', 'subnet_id': 'str', 'time_created': 'datetime', 'time_updated': 'datetime' @@ -146,6 +151,7 @@ def __init__(self, **kwargs): 'nsg_ids': 'nsgIds', 'owner_principal_id': 'ownerPrincipalId', 'owner_user_name': 'ownerUserName', + 'scan_details': 'scanDetails', 'subnet_id': 'subnetId', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated' @@ -164,6 +170,7 @@ def __init__(self, **kwargs): self._nsg_ids = None self._owner_principal_id = None self._owner_user_name = None + self._scan_details = None self._subnet_id = None self._time_created = None self._time_updated = None @@ -510,6 +517,32 @@ def owner_user_name(self, owner_user_name): """ self._owner_user_name = owner_user_name + @property + def scan_details(self): + """ + Gets the scan_details of this PrivateEndpoint. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :return: The scan_details of this PrivateEndpoint. + :rtype: list[oci.data_flow.models.Scan] + """ + return self._scan_details + + @scan_details.setter + def scan_details(self, scan_details): + """ + Sets the scan_details of this PrivateEndpoint. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :param scan_details: The scan_details of this PrivateEndpoint. + :type: list[oci.data_flow.models.Scan] + """ + self._scan_details = scan_details + @property def subnet_id(self): """ diff --git a/src/oci/data_flow/models/private_endpoint_summary.py b/src/oci/data_flow/models/private_endpoint_summary.py index cd8b110421..52afee1b3e 100644 --- a/src/oci/data_flow/models/private_endpoint_summary.py +++ b/src/oci/data_flow/models/private_endpoint_summary.py @@ -92,6 +92,10 @@ def __init__(self, **kwargs): The value to assign to the owner_user_name property of this PrivateEndpointSummary. :type owner_user_name: str + :param scan_details: + The value to assign to the scan_details property of this PrivateEndpointSummary. + :type scan_details: list[oci.data_flow.models.Scan] + :param subnet_id: The value to assign to the subnet_id property of this PrivateEndpointSummary. :type subnet_id: str @@ -117,6 +121,7 @@ def __init__(self, **kwargs): 'nsg_ids': 'list[str]', 'owner_principal_id': 'str', 'owner_user_name': 'str', + 'scan_details': 'list[Scan]', 'subnet_id': 'str', 'time_created': 'datetime', 'time_updated': 'datetime' @@ -134,6 +139,7 @@ def __init__(self, **kwargs): 'nsg_ids': 'nsgIds', 'owner_principal_id': 'ownerPrincipalId', 'owner_user_name': 'ownerUserName', + 'scan_details': 'scanDetails', 'subnet_id': 'subnetId', 'time_created': 'timeCreated', 'time_updated': 'timeUpdated' @@ -150,6 +156,7 @@ def __init__(self, **kwargs): self._nsg_ids = None self._owner_principal_id = None self._owner_user_name = None + self._scan_details = None self._subnet_id = None self._time_created = None self._time_updated = None @@ -448,6 +455,32 @@ def owner_user_name(self, owner_user_name): """ self._owner_user_name = owner_user_name + @property + def scan_details(self): + """ + Gets the scan_details of this PrivateEndpointSummary. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :return: The scan_details of this PrivateEndpointSummary. + :rtype: list[oci.data_flow.models.Scan] + """ + return self._scan_details + + @scan_details.setter + def scan_details(self, scan_details): + """ + Sets the scan_details of this PrivateEndpointSummary. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :param scan_details: The scan_details of this PrivateEndpointSummary. + :type: list[oci.data_flow.models.Scan] + """ + self._scan_details = scan_details + @property def subnet_id(self): """ diff --git a/src/oci/data_flow/models/scan.py b/src/oci/data_flow/models/scan.py new file mode 100644 index 0000000000..c77bf62851 --- /dev/null +++ b/src/oci/data_flow/models/scan.py @@ -0,0 +1,101 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class Scan(object): + """ + Single Client Access Name (SCAN) is the object with a fully-qualified domain name and a port number. + """ + + def __init__(self, **kwargs): + """ + Initializes a new Scan object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param fqdn: + The value to assign to the fqdn property of this Scan. + :type fqdn: str + + :param port: + The value to assign to the port property of this Scan. + :type port: str + + """ + self.swagger_types = { + 'fqdn': 'str', + 'port': 'str' + } + + self.attribute_map = { + 'fqdn': 'fqdn', + 'port': 'port' + } + + self._fqdn = None + self._port = None + + @property + def fqdn(self): + """ + Gets the fqdn of this Scan. + A fully-qualified domain name (FQDN). + + + :return: The fqdn of this Scan. + :rtype: str + """ + return self._fqdn + + @fqdn.setter + def fqdn(self, fqdn): + """ + Sets the fqdn of this Scan. + A fully-qualified domain name (FQDN). + + + :param fqdn: The fqdn of this Scan. + :type: str + """ + self._fqdn = fqdn + + @property + def port(self): + """ + Gets the port of this Scan. + The port number of the FQDN + + + :return: The port of this Scan. + :rtype: str + """ + return self._port + + @port.setter + def port(self, port): + """ + Sets the port of this Scan. + The port number of the FQDN + + + :param port: The port of this Scan. + :type: str + """ + self._port = port + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/data_flow/models/update_private_endpoint_details.py b/src/oci/data_flow/models/update_private_endpoint_details.py index c3c1679ba0..76443fba92 100644 --- a/src/oci/data_flow/models/update_private_endpoint_details.py +++ b/src/oci/data_flow/models/update_private_endpoint_details.py @@ -46,6 +46,10 @@ def __init__(self, **kwargs): The value to assign to the nsg_ids property of this UpdatePrivateEndpointDetails. :type nsg_ids: list[str] + :param scan_details: + The value to assign to the scan_details property of this UpdatePrivateEndpointDetails. + :type scan_details: list[oci.data_flow.models.Scan] + """ self.swagger_types = { 'defined_tags': 'dict(str, dict(str, object))', @@ -54,7 +58,8 @@ def __init__(self, **kwargs): 'dns_zones': 'list[str]', 'freeform_tags': 'dict(str, str)', 'max_host_count': 'int', - 'nsg_ids': 'list[str]' + 'nsg_ids': 'list[str]', + 'scan_details': 'list[Scan]' } self.attribute_map = { @@ -64,7 +69,8 @@ def __init__(self, **kwargs): 'dns_zones': 'dnsZones', 'freeform_tags': 'freeformTags', 'max_host_count': 'maxHostCount', - 'nsg_ids': 'nsgIds' + 'nsg_ids': 'nsgIds', + 'scan_details': 'scanDetails' } self._defined_tags = None @@ -74,6 +80,7 @@ def __init__(self, **kwargs): self._freeform_tags = None self._max_host_count = None self._nsg_ids = None + self._scan_details = None @property def defined_tags(self): @@ -265,6 +272,32 @@ def nsg_ids(self, nsg_ids): """ self._nsg_ids = nsg_ids + @property + def scan_details(self): + """ + Gets the scan_details of this UpdatePrivateEndpointDetails. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :return: The scan_details of this UpdatePrivateEndpointDetails. + :rtype: list[oci.data_flow.models.Scan] + """ + return self._scan_details + + @scan_details.setter + def scan_details(self, scan_details): + """ + Sets the scan_details of this UpdatePrivateEndpointDetails. + An array of fqdn/port pairs used to create private endpoint. Each object is a simple key-value pair with FQDN as key and port number as value. + [ { fqdn: \"scan1.oracle.com\", port: \"1521\"}, { fqdn: \"scan2.oracle.com\", port: \"1521\" } ] + + + :param scan_details: The scan_details of this UpdatePrivateEndpointDetails. + :type: list[oci.data_flow.models.Scan] + """ + self._scan_details = scan_details + def __repr__(self): return formatted_flat_dict(self) diff --git a/src/oci/database/database_client.py b/src/oci/database/database_client.py index 4d5db89079..523bfc1f6f 100644 --- a/src/oci/database/database_client.py +++ b/src/oci/database/database_client.py @@ -215,6 +215,117 @@ def activate_exadata_infrastructure(self, exadata_infrastructure_id, activate_ex operation_name=operation_name, api_reference_link=api_reference_link) + def add_storage_capacity_cloud_exadata_infrastructure(self, cloud_exadata_infrastructure_id, **kwargs): + """ + Makes the storage capacity from additional storage servers available for Cloud VM Cluster consumption. Applies to Exadata Cloud Service instances and Autonomous Database on dedicated Exadata infrastructure only. + + + :param str cloud_exadata_infrastructure_id: (required) + The cloud Exadata infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param str opc_request_id: (optional) + Unique identifier for the request. + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database.models.CloudExadataInfrastructure` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use add_storage_capacity_cloud_exadata_infrastructure API. + """ + resource_path = "/cloudExadataInfrastructures/{cloudExadataInfrastructureId}/actions/addStorageCapacity" + method = "POST" + operation_name = "add_storage_capacity_cloud_exadata_infrastructure" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/CloudExadataInfrastructure/AddStorageCapacityCloudExadataInfrastructure" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "if_match", + "opc_request_id", + "opc_retry_token" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "add_storage_capacity_cloud_exadata_infrastructure got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "cloudExadataInfrastructureId": cloud_exadata_infrastructure_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "if-match": kwargs.get("if_match", missing), + "opc-request-id": kwargs.get("opc_request_id", missing), + "opc-retry-token": kwargs.get("opc_retry_token", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="CloudExadataInfrastructure", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + response_type="CloudExadataInfrastructure", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + def add_storage_capacity_exadata_infrastructure(self, exadata_infrastructure_id, **kwargs): """ Makes the storage capacity from additional storage servers available for VM Cluster consumption. Applies to Exadata Cloud@Customer instances only. @@ -326,6 +437,122 @@ def add_storage_capacity_exadata_infrastructure(self, exadata_infrastructure_id, operation_name=operation_name, api_reference_link=api_reference_link) + def add_virtual_machine_to_cloud_vm_cluster(self, add_virtual_machine_to_cloud_vm_cluster_details, cloud_vm_cluster_id, **kwargs): + """ + Add Virtual Machines to the Cloud VM cluster. Applies to Exadata Cloud instances only. + + + :param oci.database.models.AddVirtualMachineToCloudVmClusterDetails add_virtual_machine_to_cloud_vm_cluster_details: (required) + Request to add Virtual Machines to the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param str opc_request_id: (optional) + Unique identifier for the request. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database.models.CloudVmCluster` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use add_virtual_machine_to_cloud_vm_cluster API. + """ + resource_path = "/cloudVmClusters/{cloudVmClusterId}/actions/addVirtualMachine" + method = "POST" + operation_name = "add_virtual_machine_to_cloud_vm_cluster" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/CloudVmCluster/AddVirtualMachineToCloudVmCluster" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_retry_token", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "add_virtual_machine_to_cloud_vm_cluster got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "cloudVmClusterId": cloud_vm_cluster_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing), + "opc-request-id": kwargs.get("opc_request_id", missing), + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=add_virtual_machine_to_cloud_vm_cluster_details, + response_type="CloudVmCluster", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=add_virtual_machine_to_cloud_vm_cluster_details, + response_type="CloudVmCluster", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + def add_virtual_machine_to_vm_cluster(self, add_virtual_machine_to_vm_cluster_details, vm_cluster_id, **kwargs): """ Add Virtual Machines to the VM cluster. Applies to Exadata Cloud@Customer instances only. @@ -16504,6 +16731,116 @@ def list_autonomous_database_dataguard_associations(self, autonomous_database_id operation_name=operation_name, api_reference_link=api_reference_link) + def list_autonomous_database_refreshable_clones(self, autonomous_database_id, **kwargs): + """ + Lists the OCIDs of the Autonomous Database local and connected remote refreshable clones with the region where they exist for the specified source database. + + + :param str autonomous_database_id: (required) + The database `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param str opc_request_id: (optional) + Unique identifier for the request. + + :param int limit: (optional) + The maximum number of items to return per page. + + :param str page: (optional) + The pagination token to continue listing from. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database.models.RefreshableCloneCollection` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use list_autonomous_database_refreshable_clones API. + """ + resource_path = "/autonomousDatabases/{autonomousDatabaseId}/refreshableClones" + method = "GET" + operation_name = "list_autonomous_database_refreshable_clones" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/AutonomousDatabase/ListAutonomousDatabaseRefreshableClones" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_request_id", + "limit", + "page" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "list_autonomous_database_refreshable_clones got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "autonomousDatabaseId": autonomous_database_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + query_params = { + "limit": kwargs.get("limit", missing), + "page": kwargs.get("page", missing) + } + query_params = {k: v for (k, v) in six.iteritems(query_params) if v is not missing and v is not None} + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-request-id": kwargs.get("opc_request_id", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + response_type="RefreshableCloneCollection", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + query_params=query_params, + header_params=header_params, + response_type="RefreshableCloneCollection", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + def list_autonomous_databases(self, compartment_id, **kwargs): """ Gets a list of Autonomous Databases based on the query parameters specified. @@ -24175,6 +24512,122 @@ def remote_clone_pluggable_database(self, remote_clone_pluggable_database_detail operation_name=operation_name, api_reference_link=api_reference_link) + def remove_virtual_machine_from_cloud_vm_cluster(self, remove_virtual_machine_from_cloud_vm_cluster_details, cloud_vm_cluster_id, **kwargs): + """ + Remove Virtual Machines from the Cloud VM cluster. Applies to Exadata Cloud instances only. + + + :param oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails remove_virtual_machine_from_cloud_vm_cluster_details: (required) + Request to remove Virtual Machines from the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param str opc_retry_token: (optional) + A token that uniquely identifies a request so it can be retried in case of a timeout or + server error without risk of executing that same action again. Retry tokens expire after 24 + hours, but can be invalidated before then due to conflicting operations (for example, if a resource + has been deleted and purged from the system, then a retry of the original creation request + may be rejected). + + :param str opc_request_id: (optional) + Unique identifier for the request. + + :param str if_match: (optional) + For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` + parameter to the value of the etag from a previous GET or POST response for that resource. The resource + will be updated or deleted only if the etag you provide matches the resource's current etag value. + + :param obj retry_strategy: (optional) + A retry strategy to apply to this specific operation/call. This will override any retry strategy set at the client-level. + + This should be one of the strategies available in the :py:mod:`~oci.retry` module. This operation will not retry by default, users can also use the convenient :py:data:`~oci.retry.DEFAULT_RETRY_STRATEGY` provided by the SDK to enable retries for it. + The specifics of the default retry strategy are described `here `__. + + To have this operation explicitly not perform any retries, pass an instance of :py:class:`~oci.retry.NoneRetryStrategy`. + + :param bool allow_control_chars: (optional) + allow_control_chars is a boolean to indicate whether or not this request should allow control characters in the response object. + By default, the response will not allow control characters in strings + + :return: A :class:`~oci.response.Response` object with data of type :class:`~oci.database.models.CloudVmCluster` + :rtype: :class:`~oci.response.Response` + + :example: + Click `here `__ to see an example of how to use remove_virtual_machine_from_cloud_vm_cluster API. + """ + resource_path = "/cloudVmClusters/{cloudVmClusterId}/actions/removeVirtualMachine" + method = "POST" + operation_name = "remove_virtual_machine_from_cloud_vm_cluster" + api_reference_link = "https://docs.oracle.com/iaas/api/#/en/database/20160918/CloudVmCluster/RemoveVirtualMachineFromCloudVmCluster" + + # Don't accept unknown kwargs + expected_kwargs = [ + "allow_control_chars", + "retry_strategy", + "opc_retry_token", + "opc_request_id", + "if_match" + ] + extra_kwargs = [_key for _key in six.iterkeys(kwargs) if _key not in expected_kwargs] + if extra_kwargs: + raise ValueError( + "remove_virtual_machine_from_cloud_vm_cluster got unknown kwargs: {!r}".format(extra_kwargs)) + + path_params = { + "cloudVmClusterId": cloud_vm_cluster_id + } + + path_params = {k: v for (k, v) in six.iteritems(path_params) if v is not missing} + + for (k, v) in six.iteritems(path_params): + if v is None or (isinstance(v, six.string_types) and len(v.strip()) == 0): + raise ValueError('Parameter {} cannot be None, whitespace or empty string'.format(k)) + + header_params = { + "accept": "application/json", + "content-type": "application/json", + "opc-retry-token": kwargs.get("opc_retry_token", missing), + "opc-request-id": kwargs.get("opc_request_id", missing), + "if-match": kwargs.get("if_match", missing) + } + header_params = {k: v for (k, v) in six.iteritems(header_params) if v is not missing and v is not None} + + retry_strategy = self.base_client.get_preferred_retry_strategy( + operation_retry_strategy=kwargs.get('retry_strategy'), + client_retry_strategy=self.retry_strategy + ) + + if retry_strategy: + if not isinstance(retry_strategy, retry.NoneRetryStrategy): + self.base_client.add_opc_retry_token_if_needed(header_params) + self.base_client.add_opc_client_retries_header(header_params) + retry_strategy.add_circuit_breaker_callback(self.circuit_breaker_callback) + return retry_strategy.make_retrying_call( + self.base_client.call_api, + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=remove_virtual_machine_from_cloud_vm_cluster_details, + response_type="CloudVmCluster", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + else: + return self.base_client.call_api( + resource_path=resource_path, + method=method, + path_params=path_params, + header_params=header_params, + body=remove_virtual_machine_from_cloud_vm_cluster_details, + response_type="CloudVmCluster", + allow_control_chars=kwargs.get('allow_control_chars'), + operation_name=operation_name, + api_reference_link=api_reference_link) + def remove_virtual_machine_from_vm_cluster(self, remove_virtual_machine_from_vm_cluster_details, vm_cluster_id, **kwargs): """ Remove Virtual Machines from the VM cluster. Applies to Exadata Cloud@Customer instances only. diff --git a/src/oci/database/database_client_composite_operations.py b/src/oci/database/database_client_composite_operations.py index 36c04413c8..bd21348aa6 100644 --- a/src/oci/database/database_client_composite_operations.py +++ b/src/oci/database/database_client_composite_operations.py @@ -115,6 +115,88 @@ def activate_exadata_infrastructure_and_wait_for_state(self, exadata_infrastruct except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def add_storage_capacity_cloud_exadata_infrastructure_and_wait_for_work_request(self, cloud_exadata_infrastructure_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.add_storage_capacity_cloud_exadata_infrastructure` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param str cloud_exadata_infrastructure_id: (required) + The cloud Exadata infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.add_storage_capacity_cloud_exadata_infrastructure` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.add_storage_capacity_cloud_exadata_infrastructure(cloud_exadata_infrastructure_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def add_storage_capacity_cloud_exadata_infrastructure_and_wait_for_state(self, cloud_exadata_infrastructure_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.add_storage_capacity_cloud_exadata_infrastructure` and waits for the :py:class:`~oci.database.models.CloudExadataInfrastructure` acted upon + to enter the given state(s). + + :param str cloud_exadata_infrastructure_id: (required) + The cloud Exadata infrastructure `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.CloudExadataInfrastructure.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.add_storage_capacity_cloud_exadata_infrastructure` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.add_storage_capacity_cloud_exadata_infrastructure(cloud_exadata_infrastructure_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + cloud_exadata_infrastructure_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_cloud_exadata_infrastructure(cloud_exadata_infrastructure_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def add_storage_capacity_exadata_infrastructure_and_wait_for_work_request(self, exadata_infrastructure_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.add_storage_capacity_exadata_infrastructure` and waits for the oci.work_requests.models.WorkRequest @@ -197,6 +279,94 @@ def add_storage_capacity_exadata_infrastructure_and_wait_for_state(self, exadata except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def add_virtual_machine_to_cloud_vm_cluster_and_wait_for_work_request(self, add_virtual_machine_to_cloud_vm_cluster_details, cloud_vm_cluster_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.add_virtual_machine_to_cloud_vm_cluster` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param oci.database.models.AddVirtualMachineToCloudVmClusterDetails add_virtual_machine_to_cloud_vm_cluster_details: (required) + Request to add Virtual Machines to the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.add_virtual_machine_to_cloud_vm_cluster` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.add_virtual_machine_to_cloud_vm_cluster(add_virtual_machine_to_cloud_vm_cluster_details, cloud_vm_cluster_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def add_virtual_machine_to_cloud_vm_cluster_and_wait_for_state(self, add_virtual_machine_to_cloud_vm_cluster_details, cloud_vm_cluster_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.add_virtual_machine_to_cloud_vm_cluster` and waits for the :py:class:`~oci.database.models.CloudVmCluster` acted upon + to enter the given state(s). + + :param oci.database.models.AddVirtualMachineToCloudVmClusterDetails add_virtual_machine_to_cloud_vm_cluster_details: (required) + Request to add Virtual Machines to the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.CloudVmCluster.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.add_virtual_machine_to_cloud_vm_cluster` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.add_virtual_machine_to_cloud_vm_cluster(add_virtual_machine_to_cloud_vm_cluster_details, cloud_vm_cluster_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + cloud_vm_cluster_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_cloud_vm_cluster(cloud_vm_cluster_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def add_virtual_machine_to_vm_cluster_and_wait_for_work_request(self, add_virtual_machine_to_vm_cluster_details, vm_cluster_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.add_virtual_machine_to_vm_cluster` and waits for the oci.work_requests.models.WorkRequest @@ -5853,6 +6023,94 @@ def remote_clone_pluggable_database_and_wait_for_state(self, remote_clone_plugga except Exception as e: raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def remove_virtual_machine_from_cloud_vm_cluster_and_wait_for_work_request(self, remove_virtual_machine_from_cloud_vm_cluster_details, cloud_vm_cluster_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.remove_virtual_machine_from_cloud_vm_cluster` and waits for the oci.work_requests.models.WorkRequest + to enter the given state(s). + + :param oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails remove_virtual_machine_from_cloud_vm_cluster_details: (required) + Request to remove Virtual Machines from the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] work_request_states: (optional) + An array of work requests states to wait on. These should be valid values for :py:attr:`~oci.work_requests.models.WorkRequest.status` + Default values are termination states: [STATUS_SUCCEEDED, STATUS_FAILED, STATUS_CANCELED] + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.remove_virtual_machine_from_cloud_vm_cluster` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.remove_virtual_machine_from_cloud_vm_cluster(remove_virtual_machine_from_cloud_vm_cluster_details, cloud_vm_cluster_id, **operation_kwargs) + work_request_states = work_request_states if work_request_states else oci.waiter._WORK_REQUEST_TERMINATION_STATES + lowered_work_request_states = [w.lower() for w in work_request_states] + work_request_id = operation_result.headers['opc-work-request-id'] + + try: + waiter_result = oci.wait_until( + self._work_request_client, + self._work_request_client.get_work_request(work_request_id), + evaluate_response=lambda r: getattr(r.data, 'status') and getattr(r.data, 'status').lower() in lowered_work_request_states, + **waiter_kwargs + ) + return waiter_result + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + + def remove_virtual_machine_from_cloud_vm_cluster_and_wait_for_state(self, remove_virtual_machine_from_cloud_vm_cluster_details, cloud_vm_cluster_id, wait_for_states=[], operation_kwargs={}, waiter_kwargs={}): + """ + Calls :py:func:`~oci.database.DatabaseClient.remove_virtual_machine_from_cloud_vm_cluster` and waits for the :py:class:`~oci.database.models.CloudVmCluster` acted upon + to enter the given state(s). + + :param oci.database.models.RemoveVirtualMachineFromCloudVmClusterDetails remove_virtual_machine_from_cloud_vm_cluster_details: (required) + Request to remove Virtual Machines from the Cloud VM cluster. + + :param str cloud_vm_cluster_id: (required) + The cloud VM cluster `OCID`__. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + :param list[str] wait_for_states: + An array of states to wait on. These should be valid values for :py:attr:`~oci.database.models.CloudVmCluster.lifecycle_state` + + :param dict operation_kwargs: + A dictionary of keyword arguments to pass to :py:func:`~oci.database.DatabaseClient.remove_virtual_machine_from_cloud_vm_cluster` + + :param dict waiter_kwargs: + A dictionary of keyword arguments to pass to the :py:func:`oci.wait_until` function. For example, you could pass ``max_interval_seconds`` or ``max_interval_seconds`` + as dictionary keys to modify how long the waiter function will wait between retries and the maximum amount of time it will wait + """ + operation_result = self.client.remove_virtual_machine_from_cloud_vm_cluster(remove_virtual_machine_from_cloud_vm_cluster_details, cloud_vm_cluster_id, **operation_kwargs) + if not wait_for_states: + return operation_result + + lowered_wait_for_states = [w.lower() for w in wait_for_states] + cloud_vm_cluster_id = operation_result.data.id + + try: + waiter_result = oci.wait_until( + self.client, + self.client.get_cloud_vm_cluster(cloud_vm_cluster_id), # noqa: F821 + evaluate_response=lambda r: getattr(r.data, 'lifecycle_state') and getattr(r.data, 'lifecycle_state').lower() in lowered_wait_for_states, + **waiter_kwargs + ) + result_to_return = waiter_result + + return result_to_return + except (NameError, TypeError) as e: + if not e.args: + e.args = ('',) + e.args = e.args + ('This composite operation is currently not supported in the SDK. Please use the operation from the service client and use waiters as an alternative. For more information on waiters, visit: "https://docs.oracle.com/en-us/iaas/tools/python/latest/api/waiters.html"', ) + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + except Exception as e: + raise oci.exceptions.CompositeOperationError(partial_results=[operation_result], cause=e) + def remove_virtual_machine_from_vm_cluster_and_wait_for_work_request(self, remove_virtual_machine_from_vm_cluster_details, vm_cluster_id, work_request_states=[], operation_kwargs={}, waiter_kwargs={}): """ Calls :py:func:`~oci.database.DatabaseClient.remove_virtual_machine_from_vm_cluster` and waits for the oci.work_requests.models.WorkRequest diff --git a/src/oci/database/models/__init__.py b/src/oci/database/models/__init__.py index 553ab4dc59..aeddd80c69 100644 --- a/src/oci/database/models/__init__.py +++ b/src/oci/database/models/__init__.py @@ -5,6 +5,7 @@ from __future__ import absolute_import from .activate_exadata_infrastructure_details import ActivateExadataInfrastructureDetails +from .add_virtual_machine_to_cloud_vm_cluster_details import AddVirtualMachineToCloudVmClusterDetails from .add_virtual_machine_to_vm_cluster_details import AddVirtualMachineToVmClusterDetails from .associated_database_details import AssociatedDatabaseDetails from .automated_mount_details import AutomatedMountDetails @@ -55,6 +56,7 @@ from .cloud_autonomous_vm_cluster import CloudAutonomousVmCluster from .cloud_autonomous_vm_cluster_summary import CloudAutonomousVmClusterSummary from .cloud_database_management_config import CloudDatabaseManagementConfig +from .cloud_db_server_details import CloudDbServerDetails from .cloud_exadata_infrastructure import CloudExadataInfrastructure from .cloud_exadata_infrastructure_summary import CloudExadataInfrastructureSummary from .cloud_vm_cluster import CloudVmCluster @@ -242,9 +244,12 @@ from .pluggable_database import PluggableDatabase from .pluggable_database_connection_strings import PluggableDatabaseConnectionStrings from .pluggable_database_summary import PluggableDatabaseSummary +from .refreshable_clone_collection import RefreshableCloneCollection +from .refreshable_clone_summary import RefreshableCloneSummary from .register_autonomous_database_data_safe_details import RegisterAutonomousDatabaseDataSafeDetails from .reinstate_data_guard_association_details import ReinstateDataGuardAssociationDetails from .remote_clone_pluggable_database_details import RemoteClonePluggableDatabaseDetails +from .remove_virtual_machine_from_cloud_vm_cluster_details import RemoveVirtualMachineFromCloudVmClusterDetails from .remove_virtual_machine_from_vm_cluster_details import RemoveVirtualMachineFromVmClusterDetails from .resize_vm_cluster_network_details import ResizeVmClusterNetworkDetails from .restore_autonomous_database_details import RestoreAutonomousDatabaseDetails @@ -305,6 +310,7 @@ # Maps type names to classes for database services. database_type_mapping = { "ActivateExadataInfrastructureDetails": ActivateExadataInfrastructureDetails, + "AddVirtualMachineToCloudVmClusterDetails": AddVirtualMachineToCloudVmClusterDetails, "AddVirtualMachineToVmClusterDetails": AddVirtualMachineToVmClusterDetails, "AssociatedDatabaseDetails": AssociatedDatabaseDetails, "AutomatedMountDetails": AutomatedMountDetails, @@ -355,6 +361,7 @@ "CloudAutonomousVmCluster": CloudAutonomousVmCluster, "CloudAutonomousVmClusterSummary": CloudAutonomousVmClusterSummary, "CloudDatabaseManagementConfig": CloudDatabaseManagementConfig, + "CloudDbServerDetails": CloudDbServerDetails, "CloudExadataInfrastructure": CloudExadataInfrastructure, "CloudExadataInfrastructureSummary": CloudExadataInfrastructureSummary, "CloudVmCluster": CloudVmCluster, @@ -542,9 +549,12 @@ "PluggableDatabase": PluggableDatabase, "PluggableDatabaseConnectionStrings": PluggableDatabaseConnectionStrings, "PluggableDatabaseSummary": PluggableDatabaseSummary, + "RefreshableCloneCollection": RefreshableCloneCollection, + "RefreshableCloneSummary": RefreshableCloneSummary, "RegisterAutonomousDatabaseDataSafeDetails": RegisterAutonomousDatabaseDataSafeDetails, "ReinstateDataGuardAssociationDetails": ReinstateDataGuardAssociationDetails, "RemoteClonePluggableDatabaseDetails": RemoteClonePluggableDatabaseDetails, + "RemoveVirtualMachineFromCloudVmClusterDetails": RemoveVirtualMachineFromCloudVmClusterDetails, "RemoveVirtualMachineFromVmClusterDetails": RemoveVirtualMachineFromVmClusterDetails, "ResizeVmClusterNetworkDetails": ResizeVmClusterNetworkDetails, "RestoreAutonomousDatabaseDetails": RestoreAutonomousDatabaseDetails, diff --git a/src/oci/database/models/add_virtual_machine_to_cloud_vm_cluster_details.py b/src/oci/database/models/add_virtual_machine_to_cloud_vm_cluster_details.py new file mode 100644 index 0000000000..b364f0a05a --- /dev/null +++ b/src/oci/database/models/add_virtual_machine_to_cloud_vm_cluster_details.py @@ -0,0 +1,70 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class AddVirtualMachineToCloudVmClusterDetails(object): + """ + Details of adding Virtual Machines to the Cloud VM Cluster. Applies to Exadata Cloud instances only. + """ + + def __init__(self, **kwargs): + """ + Initializes a new AddVirtualMachineToCloudVmClusterDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param db_servers: + The value to assign to the db_servers property of this AddVirtualMachineToCloudVmClusterDetails. + :type db_servers: list[oci.database.models.CloudDbServerDetails] + + """ + self.swagger_types = { + 'db_servers': 'list[CloudDbServerDetails]' + } + + self.attribute_map = { + 'db_servers': 'dbServers' + } + + self._db_servers = None + + @property + def db_servers(self): + """ + **[Required]** Gets the db_servers of this AddVirtualMachineToCloudVmClusterDetails. + The list of ExaCS DB servers for the cluster to be added. + + + :return: The db_servers of this AddVirtualMachineToCloudVmClusterDetails. + :rtype: list[oci.database.models.CloudDbServerDetails] + """ + return self._db_servers + + @db_servers.setter + def db_servers(self, db_servers): + """ + Sets the db_servers of this AddVirtualMachineToCloudVmClusterDetails. + The list of ExaCS DB servers for the cluster to be added. + + + :param db_servers: The db_servers of this AddVirtualMachineToCloudVmClusterDetails. + :type: list[oci.database.models.CloudDbServerDetails] + """ + self._db_servers = db_servers + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/database/models/cloud_db_server_details.py b/src/oci/database/models/cloud_db_server_details.py new file mode 100644 index 0000000000..dad2e02bc2 --- /dev/null +++ b/src/oci/database/models/cloud_db_server_details.py @@ -0,0 +1,74 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CloudDbServerDetails(object): + """ + Details of the ExaCs Db server. Applies to Exadata Cloud instances only. + """ + + def __init__(self, **kwargs): + """ + Initializes a new CloudDbServerDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param db_server_id: + The value to assign to the db_server_id property of this CloudDbServerDetails. + :type db_server_id: str + + """ + self.swagger_types = { + 'db_server_id': 'str' + } + + self.attribute_map = { + 'db_server_id': 'dbServerId' + } + + self._db_server_id = None + + @property + def db_server_id(self): + """ + **[Required]** Gets the db_server_id of this CloudDbServerDetails. + The `OCID`__ of ExaCS Db server. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The db_server_id of this CloudDbServerDetails. + :rtype: str + """ + return self._db_server_id + + @db_server_id.setter + def db_server_id(self, db_server_id): + """ + Sets the db_server_id of this CloudDbServerDetails. + The `OCID`__ of ExaCS Db server. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param db_server_id: The db_server_id of this CloudDbServerDetails. + :type: str + """ + self._db_server_id = db_server_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/database/models/cloud_exadata_infrastructure.py b/src/oci/database/models/cloud_exadata_infrastructure.py index 586b117685..2fe8161a32 100644 --- a/src/oci/database/models/cloud_exadata_infrastructure.py +++ b/src/oci/database/models/cloud_exadata_infrastructure.py @@ -88,6 +88,46 @@ def __init__(self, **kwargs): The value to assign to the available_storage_size_in_gbs property of this CloudExadataInfrastructure. :type available_storage_size_in_gbs: int + :param cpu_count: + The value to assign to the cpu_count property of this CloudExadataInfrastructure. + :type cpu_count: int + + :param max_cpu_count: + The value to assign to the max_cpu_count property of this CloudExadataInfrastructure. + :type max_cpu_count: int + + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this CloudExadataInfrastructure. + :type memory_size_in_gbs: int + + :param max_memory_in_gbs: + The value to assign to the max_memory_in_gbs property of this CloudExadataInfrastructure. + :type max_memory_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this CloudExadataInfrastructure. + :type db_node_storage_size_in_gbs: int + + :param max_db_node_storage_in_gbs: + The value to assign to the max_db_node_storage_in_gbs property of this CloudExadataInfrastructure. + :type max_db_node_storage_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this CloudExadataInfrastructure. + :type data_storage_size_in_tbs: float + + :param max_data_storage_in_tbs: + The value to assign to the max_data_storage_in_tbs property of this CloudExadataInfrastructure. + :type max_data_storage_in_tbs: float + + :param additional_storage_count: + The value to assign to the additional_storage_count property of this CloudExadataInfrastructure. + :type additional_storage_count: int + + :param activated_storage_count: + The value to assign to the activated_storage_count property of this CloudExadataInfrastructure. + :type activated_storage_count: int + :param time_created: The value to assign to the time_created property of this CloudExadataInfrastructure. :type time_created: datetime @@ -132,6 +172,16 @@ def __init__(self, **kwargs): 'storage_count': 'int', 'total_storage_size_in_gbs': 'int', 'available_storage_size_in_gbs': 'int', + 'cpu_count': 'int', + 'max_cpu_count': 'int', + 'memory_size_in_gbs': 'int', + 'max_memory_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'max_db_node_storage_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', + 'max_data_storage_in_tbs': 'float', + 'additional_storage_count': 'int', + 'activated_storage_count': 'int', 'time_created': 'datetime', 'lifecycle_details': 'str', 'maintenance_window': 'MaintenanceWindow', @@ -153,6 +203,16 @@ def __init__(self, **kwargs): 'storage_count': 'storageCount', 'total_storage_size_in_gbs': 'totalStorageSizeInGBs', 'available_storage_size_in_gbs': 'availableStorageSizeInGBs', + 'cpu_count': 'cpuCount', + 'max_cpu_count': 'maxCpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'max_memory_in_gbs': 'maxMemoryInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'max_db_node_storage_in_gbs': 'maxDbNodeStorageInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', + 'max_data_storage_in_tbs': 'maxDataStorageInTBs', + 'additional_storage_count': 'additionalStorageCount', + 'activated_storage_count': 'activatedStorageCount', 'time_created': 'timeCreated', 'lifecycle_details': 'lifecycleDetails', 'maintenance_window': 'maintenanceWindow', @@ -173,6 +233,16 @@ def __init__(self, **kwargs): self._storage_count = None self._total_storage_size_in_gbs = None self._available_storage_size_in_gbs = None + self._cpu_count = None + self._max_cpu_count = None + self._memory_size_in_gbs = None + self._max_memory_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._max_db_node_storage_in_gbs = None + self._data_storage_size_in_tbs = None + self._max_data_storage_in_tbs = None + self._additional_storage_count = None + self._activated_storage_count = None self._time_created = None self._lifecycle_details = None self._maintenance_window = None @@ -436,6 +506,246 @@ def available_storage_size_in_gbs(self, available_storage_size_in_gbs): """ self._available_storage_size_in_gbs = available_storage_size_in_gbs + @property + def cpu_count(self): + """ + Gets the cpu_count of this CloudExadataInfrastructure. + The total number of CPU cores allocated. + + + :return: The cpu_count of this CloudExadataInfrastructure. + :rtype: int + """ + return self._cpu_count + + @cpu_count.setter + def cpu_count(self, cpu_count): + """ + Sets the cpu_count of this CloudExadataInfrastructure. + The total number of CPU cores allocated. + + + :param cpu_count: The cpu_count of this CloudExadataInfrastructure. + :type: int + """ + self._cpu_count = cpu_count + + @property + def max_cpu_count(self): + """ + Gets the max_cpu_count of this CloudExadataInfrastructure. + The total number of CPU cores available. + + + :return: The max_cpu_count of this CloudExadataInfrastructure. + :rtype: int + """ + return self._max_cpu_count + + @max_cpu_count.setter + def max_cpu_count(self, max_cpu_count): + """ + Sets the max_cpu_count of this CloudExadataInfrastructure. + The total number of CPU cores available. + + + :param max_cpu_count: The max_cpu_count of this CloudExadataInfrastructure. + :type: int + """ + self._max_cpu_count = max_cpu_count + + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this CloudExadataInfrastructure. + The memory allocated in GBs. + + + :return: The memory_size_in_gbs of this CloudExadataInfrastructure. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this CloudExadataInfrastructure. + The memory allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this CloudExadataInfrastructure. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def max_memory_in_gbs(self): + """ + Gets the max_memory_in_gbs of this CloudExadataInfrastructure. + The total memory available in GBs. + + + :return: The max_memory_in_gbs of this CloudExadataInfrastructure. + :rtype: int + """ + return self._max_memory_in_gbs + + @max_memory_in_gbs.setter + def max_memory_in_gbs(self, max_memory_in_gbs): + """ + Sets the max_memory_in_gbs of this CloudExadataInfrastructure. + The total memory available in GBs. + + + :param max_memory_in_gbs: The max_memory_in_gbs of this CloudExadataInfrastructure. + :type: int + """ + self._max_memory_in_gbs = max_memory_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this CloudExadataInfrastructure. + The local node storage allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this CloudExadataInfrastructure. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this CloudExadataInfrastructure. + The local node storage allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this CloudExadataInfrastructure. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def max_db_node_storage_in_gbs(self): + """ + Gets the max_db_node_storage_in_gbs of this CloudExadataInfrastructure. + The total local node storage available in GBs. + + + :return: The max_db_node_storage_in_gbs of this CloudExadataInfrastructure. + :rtype: int + """ + return self._max_db_node_storage_in_gbs + + @max_db_node_storage_in_gbs.setter + def max_db_node_storage_in_gbs(self, max_db_node_storage_in_gbs): + """ + Sets the max_db_node_storage_in_gbs of this CloudExadataInfrastructure. + The total local node storage available in GBs. + + + :param max_db_node_storage_in_gbs: The max_db_node_storage_in_gbs of this CloudExadataInfrastructure. + :type: int + """ + self._max_db_node_storage_in_gbs = max_db_node_storage_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this CloudExadataInfrastructure. + Size, in terabytes, of the DATA disk group. + + + :return: The data_storage_size_in_tbs of this CloudExadataInfrastructure. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this CloudExadataInfrastructure. + Size, in terabytes, of the DATA disk group. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this CloudExadataInfrastructure. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + + @property + def max_data_storage_in_tbs(self): + """ + Gets the max_data_storage_in_tbs of this CloudExadataInfrastructure. + The total available DATA disk group size. + + + :return: The max_data_storage_in_tbs of this CloudExadataInfrastructure. + :rtype: float + """ + return self._max_data_storage_in_tbs + + @max_data_storage_in_tbs.setter + def max_data_storage_in_tbs(self, max_data_storage_in_tbs): + """ + Sets the max_data_storage_in_tbs of this CloudExadataInfrastructure. + The total available DATA disk group size. + + + :param max_data_storage_in_tbs: The max_data_storage_in_tbs of this CloudExadataInfrastructure. + :type: float + """ + self._max_data_storage_in_tbs = max_data_storage_in_tbs + + @property + def additional_storage_count(self): + """ + Gets the additional_storage_count of this CloudExadataInfrastructure. + The requested number of additional storage servers for the Exadata infrastructure. + + + :return: The additional_storage_count of this CloudExadataInfrastructure. + :rtype: int + """ + return self._additional_storage_count + + @additional_storage_count.setter + def additional_storage_count(self, additional_storage_count): + """ + Sets the additional_storage_count of this CloudExadataInfrastructure. + The requested number of additional storage servers for the Exadata infrastructure. + + + :param additional_storage_count: The additional_storage_count of this CloudExadataInfrastructure. + :type: int + """ + self._additional_storage_count = additional_storage_count + + @property + def activated_storage_count(self): + """ + Gets the activated_storage_count of this CloudExadataInfrastructure. + The requested number of additional storage servers activated for the Exadata infrastructure. + + + :return: The activated_storage_count of this CloudExadataInfrastructure. + :rtype: int + """ + return self._activated_storage_count + + @activated_storage_count.setter + def activated_storage_count(self, activated_storage_count): + """ + Sets the activated_storage_count of this CloudExadataInfrastructure. + The requested number of additional storage servers activated for the Exadata infrastructure. + + + :param activated_storage_count: The activated_storage_count of this CloudExadataInfrastructure. + :type: int + """ + self._activated_storage_count = activated_storage_count + @property def time_created(self): """ diff --git a/src/oci/database/models/cloud_exadata_infrastructure_summary.py b/src/oci/database/models/cloud_exadata_infrastructure_summary.py index 611c757e5c..f595514531 100644 --- a/src/oci/database/models/cloud_exadata_infrastructure_summary.py +++ b/src/oci/database/models/cloud_exadata_infrastructure_summary.py @@ -88,6 +88,46 @@ def __init__(self, **kwargs): The value to assign to the available_storage_size_in_gbs property of this CloudExadataInfrastructureSummary. :type available_storage_size_in_gbs: int + :param cpu_count: + The value to assign to the cpu_count property of this CloudExadataInfrastructureSummary. + :type cpu_count: int + + :param max_cpu_count: + The value to assign to the max_cpu_count property of this CloudExadataInfrastructureSummary. + :type max_cpu_count: int + + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this CloudExadataInfrastructureSummary. + :type memory_size_in_gbs: int + + :param max_memory_in_gbs: + The value to assign to the max_memory_in_gbs property of this CloudExadataInfrastructureSummary. + :type max_memory_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this CloudExadataInfrastructureSummary. + :type db_node_storage_size_in_gbs: int + + :param max_db_node_storage_in_gbs: + The value to assign to the max_db_node_storage_in_gbs property of this CloudExadataInfrastructureSummary. + :type max_db_node_storage_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this CloudExadataInfrastructureSummary. + :type data_storage_size_in_tbs: float + + :param max_data_storage_in_tbs: + The value to assign to the max_data_storage_in_tbs property of this CloudExadataInfrastructureSummary. + :type max_data_storage_in_tbs: float + + :param additional_storage_count: + The value to assign to the additional_storage_count property of this CloudExadataInfrastructureSummary. + :type additional_storage_count: int + + :param activated_storage_count: + The value to assign to the activated_storage_count property of this CloudExadataInfrastructureSummary. + :type activated_storage_count: int + :param time_created: The value to assign to the time_created property of this CloudExadataInfrastructureSummary. :type time_created: datetime @@ -132,6 +172,16 @@ def __init__(self, **kwargs): 'storage_count': 'int', 'total_storage_size_in_gbs': 'int', 'available_storage_size_in_gbs': 'int', + 'cpu_count': 'int', + 'max_cpu_count': 'int', + 'memory_size_in_gbs': 'int', + 'max_memory_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'max_db_node_storage_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', + 'max_data_storage_in_tbs': 'float', + 'additional_storage_count': 'int', + 'activated_storage_count': 'int', 'time_created': 'datetime', 'lifecycle_details': 'str', 'maintenance_window': 'MaintenanceWindow', @@ -153,6 +203,16 @@ def __init__(self, **kwargs): 'storage_count': 'storageCount', 'total_storage_size_in_gbs': 'totalStorageSizeInGBs', 'available_storage_size_in_gbs': 'availableStorageSizeInGBs', + 'cpu_count': 'cpuCount', + 'max_cpu_count': 'maxCpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'max_memory_in_gbs': 'maxMemoryInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'max_db_node_storage_in_gbs': 'maxDbNodeStorageInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', + 'max_data_storage_in_tbs': 'maxDataStorageInTBs', + 'additional_storage_count': 'additionalStorageCount', + 'activated_storage_count': 'activatedStorageCount', 'time_created': 'timeCreated', 'lifecycle_details': 'lifecycleDetails', 'maintenance_window': 'maintenanceWindow', @@ -173,6 +233,16 @@ def __init__(self, **kwargs): self._storage_count = None self._total_storage_size_in_gbs = None self._available_storage_size_in_gbs = None + self._cpu_count = None + self._max_cpu_count = None + self._memory_size_in_gbs = None + self._max_memory_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._max_db_node_storage_in_gbs = None + self._data_storage_size_in_tbs = None + self._max_data_storage_in_tbs = None + self._additional_storage_count = None + self._activated_storage_count = None self._time_created = None self._lifecycle_details = None self._maintenance_window = None @@ -436,6 +506,246 @@ def available_storage_size_in_gbs(self, available_storage_size_in_gbs): """ self._available_storage_size_in_gbs = available_storage_size_in_gbs + @property + def cpu_count(self): + """ + Gets the cpu_count of this CloudExadataInfrastructureSummary. + The total number of CPU cores allocated. + + + :return: The cpu_count of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._cpu_count + + @cpu_count.setter + def cpu_count(self, cpu_count): + """ + Sets the cpu_count of this CloudExadataInfrastructureSummary. + The total number of CPU cores allocated. + + + :param cpu_count: The cpu_count of this CloudExadataInfrastructureSummary. + :type: int + """ + self._cpu_count = cpu_count + + @property + def max_cpu_count(self): + """ + Gets the max_cpu_count of this CloudExadataInfrastructureSummary. + The total number of CPU cores available. + + + :return: The max_cpu_count of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._max_cpu_count + + @max_cpu_count.setter + def max_cpu_count(self, max_cpu_count): + """ + Sets the max_cpu_count of this CloudExadataInfrastructureSummary. + The total number of CPU cores available. + + + :param max_cpu_count: The max_cpu_count of this CloudExadataInfrastructureSummary. + :type: int + """ + self._max_cpu_count = max_cpu_count + + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this CloudExadataInfrastructureSummary. + The memory allocated in GBs. + + + :return: The memory_size_in_gbs of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this CloudExadataInfrastructureSummary. + The memory allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this CloudExadataInfrastructureSummary. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def max_memory_in_gbs(self): + """ + Gets the max_memory_in_gbs of this CloudExadataInfrastructureSummary. + The total memory available in GBs. + + + :return: The max_memory_in_gbs of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._max_memory_in_gbs + + @max_memory_in_gbs.setter + def max_memory_in_gbs(self, max_memory_in_gbs): + """ + Sets the max_memory_in_gbs of this CloudExadataInfrastructureSummary. + The total memory available in GBs. + + + :param max_memory_in_gbs: The max_memory_in_gbs of this CloudExadataInfrastructureSummary. + :type: int + """ + self._max_memory_in_gbs = max_memory_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this CloudExadataInfrastructureSummary. + The local node storage allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this CloudExadataInfrastructureSummary. + The local node storage allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this CloudExadataInfrastructureSummary. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def max_db_node_storage_in_gbs(self): + """ + Gets the max_db_node_storage_in_gbs of this CloudExadataInfrastructureSummary. + The total local node storage available in GBs. + + + :return: The max_db_node_storage_in_gbs of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._max_db_node_storage_in_gbs + + @max_db_node_storage_in_gbs.setter + def max_db_node_storage_in_gbs(self, max_db_node_storage_in_gbs): + """ + Sets the max_db_node_storage_in_gbs of this CloudExadataInfrastructureSummary. + The total local node storage available in GBs. + + + :param max_db_node_storage_in_gbs: The max_db_node_storage_in_gbs of this CloudExadataInfrastructureSummary. + :type: int + """ + self._max_db_node_storage_in_gbs = max_db_node_storage_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this CloudExadataInfrastructureSummary. + Size, in terabytes, of the DATA disk group. + + + :return: The data_storage_size_in_tbs of this CloudExadataInfrastructureSummary. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this CloudExadataInfrastructureSummary. + Size, in terabytes, of the DATA disk group. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this CloudExadataInfrastructureSummary. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + + @property + def max_data_storage_in_tbs(self): + """ + Gets the max_data_storage_in_tbs of this CloudExadataInfrastructureSummary. + The total available DATA disk group size. + + + :return: The max_data_storage_in_tbs of this CloudExadataInfrastructureSummary. + :rtype: float + """ + return self._max_data_storage_in_tbs + + @max_data_storage_in_tbs.setter + def max_data_storage_in_tbs(self, max_data_storage_in_tbs): + """ + Sets the max_data_storage_in_tbs of this CloudExadataInfrastructureSummary. + The total available DATA disk group size. + + + :param max_data_storage_in_tbs: The max_data_storage_in_tbs of this CloudExadataInfrastructureSummary. + :type: float + """ + self._max_data_storage_in_tbs = max_data_storage_in_tbs + + @property + def additional_storage_count(self): + """ + Gets the additional_storage_count of this CloudExadataInfrastructureSummary. + The requested number of additional storage servers for the Exadata infrastructure. + + + :return: The additional_storage_count of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._additional_storage_count + + @additional_storage_count.setter + def additional_storage_count(self, additional_storage_count): + """ + Sets the additional_storage_count of this CloudExadataInfrastructureSummary. + The requested number of additional storage servers for the Exadata infrastructure. + + + :param additional_storage_count: The additional_storage_count of this CloudExadataInfrastructureSummary. + :type: int + """ + self._additional_storage_count = additional_storage_count + + @property + def activated_storage_count(self): + """ + Gets the activated_storage_count of this CloudExadataInfrastructureSummary. + The requested number of additional storage servers activated for the Exadata infrastructure. + + + :return: The activated_storage_count of this CloudExadataInfrastructureSummary. + :rtype: int + """ + return self._activated_storage_count + + @activated_storage_count.setter + def activated_storage_count(self, activated_storage_count): + """ + Sets the activated_storage_count of this CloudExadataInfrastructureSummary. + The requested number of additional storage servers activated for the Exadata infrastructure. + + + :param activated_storage_count: The activated_storage_count of this CloudExadataInfrastructureSummary. + :type: int + """ + self._activated_storage_count = activated_storage_count + @property def time_created(self): """ diff --git a/src/oci/database/models/cloud_vm_cluster.py b/src/oci/database/models/cloud_vm_cluster.py index 2d6af3f75b..b2895ea0a4 100644 --- a/src/oci/database/models/cloud_vm_cluster.py +++ b/src/oci/database/models/cloud_vm_cluster.py @@ -152,6 +152,22 @@ def __init__(self, **kwargs): The value to assign to the ocpu_count property of this CloudVmCluster. :type ocpu_count: float + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this CloudVmCluster. + :type memory_size_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this CloudVmCluster. + :type db_node_storage_size_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this CloudVmCluster. + :type data_storage_size_in_tbs: float + + :param db_servers: + The value to assign to the db_servers property of this CloudVmCluster. + :type db_servers: list[str] + :param cluster_name: The value to assign to the cluster_name property of this CloudVmCluster. :type cluster_name: str @@ -260,6 +276,10 @@ def __init__(self, **kwargs): 'domain': 'str', 'cpu_core_count': 'int', 'ocpu_count': 'float', + 'memory_size_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', + 'db_servers': 'list[str]', 'cluster_name': 'str', 'data_storage_percentage': 'int', 'is_local_backup_enabled': 'bool', @@ -305,6 +325,10 @@ def __init__(self, **kwargs): 'domain': 'domain', 'cpu_core_count': 'cpuCoreCount', 'ocpu_count': 'ocpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', + 'db_servers': 'dbServers', 'cluster_name': 'clusterName', 'data_storage_percentage': 'dataStoragePercentage', 'is_local_backup_enabled': 'isLocalBackupEnabled', @@ -349,6 +373,10 @@ def __init__(self, **kwargs): self._domain = None self._cpu_core_count = None self._ocpu_count = None + self._memory_size_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._data_storage_size_in_tbs = None + self._db_servers = None self._cluster_name = None self._data_storage_percentage = None self._is_local_backup_enabled = None @@ -958,6 +986,102 @@ def ocpu_count(self, ocpu_count): """ self._ocpu_count = ocpu_count + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this CloudVmCluster. + The memory to be allocated in GBs. + + + :return: The memory_size_in_gbs of this CloudVmCluster. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this CloudVmCluster. + The memory to be allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this CloudVmCluster. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this CloudVmCluster. + The local node storage to be allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this CloudVmCluster. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this CloudVmCluster. + The local node storage to be allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this CloudVmCluster. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this CloudVmCluster. + The data disk group size to be allocated in TBs. + + + :return: The data_storage_size_in_tbs of this CloudVmCluster. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this CloudVmCluster. + The data disk group size to be allocated in TBs. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this CloudVmCluster. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + + @property + def db_servers(self): + """ + Gets the db_servers of this CloudVmCluster. + The list of Db servers. + + + :return: The db_servers of this CloudVmCluster. + :rtype: list[str] + """ + return self._db_servers + + @db_servers.setter + def db_servers(self, db_servers): + """ + Sets the db_servers of this CloudVmCluster. + The list of Db servers. + + + :param db_servers: The db_servers of this CloudVmCluster. + :type: list[str] + """ + self._db_servers = db_servers + @property def cluster_name(self): """ diff --git a/src/oci/database/models/cloud_vm_cluster_summary.py b/src/oci/database/models/cloud_vm_cluster_summary.py index 3631ccfca0..f1c7fc6599 100644 --- a/src/oci/database/models/cloud_vm_cluster_summary.py +++ b/src/oci/database/models/cloud_vm_cluster_summary.py @@ -148,6 +148,22 @@ def __init__(self, **kwargs): The value to assign to the ocpu_count property of this CloudVmClusterSummary. :type ocpu_count: float + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this CloudVmClusterSummary. + :type memory_size_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this CloudVmClusterSummary. + :type db_node_storage_size_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this CloudVmClusterSummary. + :type data_storage_size_in_tbs: float + + :param db_servers: + The value to assign to the db_servers property of this CloudVmClusterSummary. + :type db_servers: list[str] + :param cluster_name: The value to assign to the cluster_name property of this CloudVmClusterSummary. :type cluster_name: str @@ -255,6 +271,10 @@ def __init__(self, **kwargs): 'domain': 'str', 'cpu_core_count': 'int', 'ocpu_count': 'float', + 'memory_size_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', + 'db_servers': 'list[str]', 'cluster_name': 'str', 'data_storage_percentage': 'int', 'is_local_backup_enabled': 'bool', @@ -299,6 +319,10 @@ def __init__(self, **kwargs): 'domain': 'domain', 'cpu_core_count': 'cpuCoreCount', 'ocpu_count': 'ocpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', + 'db_servers': 'dbServers', 'cluster_name': 'clusterName', 'data_storage_percentage': 'dataStoragePercentage', 'is_local_backup_enabled': 'isLocalBackupEnabled', @@ -342,6 +366,10 @@ def __init__(self, **kwargs): self._domain = None self._cpu_core_count = None self._ocpu_count = None + self._memory_size_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._data_storage_size_in_tbs = None + self._db_servers = None self._cluster_name = None self._data_storage_percentage = None self._is_local_backup_enabled = None @@ -931,6 +959,102 @@ def ocpu_count(self, ocpu_count): """ self._ocpu_count = ocpu_count + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this CloudVmClusterSummary. + The memory to be allocated in GBs. + + + :return: The memory_size_in_gbs of this CloudVmClusterSummary. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this CloudVmClusterSummary. + The memory to be allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this CloudVmClusterSummary. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this CloudVmClusterSummary. + The local node storage to be allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this CloudVmClusterSummary. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this CloudVmClusterSummary. + The local node storage to be allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this CloudVmClusterSummary. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this CloudVmClusterSummary. + The data disk group size to be allocated in TBs. + + + :return: The data_storage_size_in_tbs of this CloudVmClusterSummary. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this CloudVmClusterSummary. + The data disk group size to be allocated in TBs. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this CloudVmClusterSummary. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + + @property + def db_servers(self): + """ + Gets the db_servers of this CloudVmClusterSummary. + The list of Db servers. + + + :return: The db_servers of this CloudVmClusterSummary. + :rtype: list[str] + """ + return self._db_servers + + @db_servers.setter + def db_servers(self, db_servers): + """ + Sets the db_servers of this CloudVmClusterSummary. + The list of Db servers. + + + :param db_servers: The db_servers of this CloudVmClusterSummary. + :type: list[str] + """ + self._db_servers = db_servers + @property def cluster_name(self): """ diff --git a/src/oci/database/models/create_cloud_vm_cluster_details.py b/src/oci/database/models/create_cloud_vm_cluster_details.py index b897f4fd34..af74dbe36d 100644 --- a/src/oci/database/models/create_cloud_vm_cluster_details.py +++ b/src/oci/database/models/create_cloud_vm_cluster_details.py @@ -46,6 +46,22 @@ def __init__(self, **kwargs): The value to assign to the ocpu_count property of this CreateCloudVmClusterDetails. :type ocpu_count: float + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this CreateCloudVmClusterDetails. + :type memory_size_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this CreateCloudVmClusterDetails. + :type db_node_storage_size_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this CreateCloudVmClusterDetails. + :type data_storage_size_in_tbs: float + + :param db_servers: + The value to assign to the db_servers property of this CreateCloudVmClusterDetails. + :type db_servers: list[str] + :param cluster_name: The value to assign to the cluster_name property of this CreateCloudVmClusterDetails. :type cluster_name: str @@ -130,6 +146,10 @@ def __init__(self, **kwargs): 'backup_subnet_id': 'str', 'cpu_core_count': 'int', 'ocpu_count': 'float', + 'memory_size_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', + 'db_servers': 'list[str]', 'cluster_name': 'str', 'data_storage_percentage': 'int', 'display_name': 'str', @@ -157,6 +177,10 @@ def __init__(self, **kwargs): 'backup_subnet_id': 'backupSubnetId', 'cpu_core_count': 'cpuCoreCount', 'ocpu_count': 'ocpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', + 'db_servers': 'dbServers', 'cluster_name': 'clusterName', 'data_storage_percentage': 'dataStoragePercentage', 'display_name': 'displayName', @@ -183,6 +207,10 @@ def __init__(self, **kwargs): self._backup_subnet_id = None self._cpu_core_count = None self._ocpu_count = None + self._memory_size_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._data_storage_size_in_tbs = None + self._db_servers = None self._cluster_name = None self._data_storage_percentage = None self._display_name = None @@ -351,6 +379,102 @@ def ocpu_count(self, ocpu_count): """ self._ocpu_count = ocpu_count + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this CreateCloudVmClusterDetails. + The memory to be allocated in GBs. + + + :return: The memory_size_in_gbs of this CreateCloudVmClusterDetails. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this CreateCloudVmClusterDetails. + The memory to be allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this CreateCloudVmClusterDetails. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this CreateCloudVmClusterDetails. + The local node storage to be allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this CreateCloudVmClusterDetails. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this CreateCloudVmClusterDetails. + The local node storage to be allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this CreateCloudVmClusterDetails. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this CreateCloudVmClusterDetails. + The data disk group size to be allocated in TBs. + + + :return: The data_storage_size_in_tbs of this CreateCloudVmClusterDetails. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this CreateCloudVmClusterDetails. + The data disk group size to be allocated in TBs. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this CreateCloudVmClusterDetails. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + + @property + def db_servers(self): + """ + Gets the db_servers of this CreateCloudVmClusterDetails. + The list of Db servers. + + + :return: The db_servers of this CreateCloudVmClusterDetails. + :rtype: list[str] + """ + return self._db_servers + + @db_servers.setter + def db_servers(self, db_servers): + """ + Sets the db_servers of this CreateCloudVmClusterDetails. + The list of Db servers. + + + :param db_servers: The db_servers of this CreateCloudVmClusterDetails. + :type: list[str] + """ + self._db_servers = db_servers + @property def cluster_name(self): """ diff --git a/src/oci/database/models/refreshable_clone_collection.py b/src/oci/database/models/refreshable_clone_collection.py new file mode 100644 index 0000000000..35f7706bb8 --- /dev/null +++ b/src/oci/database/models/refreshable_clone_collection.py @@ -0,0 +1,66 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class RefreshableCloneCollection(object): + """ + A list of Autonomous Database RefreshableClone containing RefreshableCloneSummary items. + """ + + def __init__(self, **kwargs): + """ + Initializes a new RefreshableCloneCollection object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param items: + The value to assign to the items property of this RefreshableCloneCollection. + :type items: list[oci.database.models.RefreshableCloneSummary] + + """ + self.swagger_types = { + 'items': 'list[RefreshableCloneSummary]' + } + + self.attribute_map = { + 'items': 'items' + } + + self._items = None + + @property + def items(self): + """ + **[Required]** Gets the items of this RefreshableCloneCollection. + + :return: The items of this RefreshableCloneCollection. + :rtype: list[oci.database.models.RefreshableCloneSummary] + """ + return self._items + + @items.setter + def items(self, items): + """ + Sets the items of this RefreshableCloneCollection. + + :param items: The items of this RefreshableCloneCollection. + :type: list[oci.database.models.RefreshableCloneSummary] + """ + self._items = items + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/database/models/refreshable_clone_summary.py b/src/oci/database/models/refreshable_clone_summary.py new file mode 100644 index 0000000000..ad7f39566b --- /dev/null +++ b/src/oci/database/models/refreshable_clone_summary.py @@ -0,0 +1,105 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class RefreshableCloneSummary(object): + """ + An Autonomous Database refreshable clone + """ + + def __init__(self, **kwargs): + """ + Initializes a new RefreshableCloneSummary object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param id: + The value to assign to the id property of this RefreshableCloneSummary. + :type id: str + + :param region: + The value to assign to the region property of this RefreshableCloneSummary. + :type region: str + + """ + self.swagger_types = { + 'id': 'str', + 'region': 'str' + } + + self.attribute_map = { + 'id': 'id', + 'region': 'region' + } + + self._id = None + self._region = None + + @property + def id(self): + """ + **[Required]** Gets the id of this RefreshableCloneSummary. + The `OCID`__ of the Autonomous Database. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :return: The id of this RefreshableCloneSummary. + :rtype: str + """ + return self._id + + @id.setter + def id(self, id): + """ + Sets the id of this RefreshableCloneSummary. + The `OCID`__ of the Autonomous Database. + + __ https://docs.cloud.oracle.com/Content/General/Concepts/identifiers.htm + + + :param id: The id of this RefreshableCloneSummary. + :type: str + """ + self._id = id + + @property + def region(self): + """ + **[Required]** Gets the region of this RefreshableCloneSummary. + The name of the region where the refreshable clone exists. + + + :return: The region of this RefreshableCloneSummary. + :rtype: str + """ + return self._region + + @region.setter + def region(self, region): + """ + Sets the region of this RefreshableCloneSummary. + The name of the region where the refreshable clone exists. + + + :param region: The region of this RefreshableCloneSummary. + :type: str + """ + self._region = region + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/database/models/remove_virtual_machine_from_cloud_vm_cluster_details.py b/src/oci/database/models/remove_virtual_machine_from_cloud_vm_cluster_details.py new file mode 100644 index 0000000000..b5b7dbef43 --- /dev/null +++ b/src/oci/database/models/remove_virtual_machine_from_cloud_vm_cluster_details.py @@ -0,0 +1,70 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + + +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class RemoveVirtualMachineFromCloudVmClusterDetails(object): + """ + Details of removing Virtual Machines from the Cloud VM Cluster. Applies to Exadata Cloud instances only. + """ + + def __init__(self, **kwargs): + """ + Initializes a new RemoveVirtualMachineFromCloudVmClusterDetails object with values from keyword arguments. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param db_servers: + The value to assign to the db_servers property of this RemoveVirtualMachineFromCloudVmClusterDetails. + :type db_servers: list[oci.database.models.CloudDbServerDetails] + + """ + self.swagger_types = { + 'db_servers': 'list[CloudDbServerDetails]' + } + + self.attribute_map = { + 'db_servers': 'dbServers' + } + + self._db_servers = None + + @property + def db_servers(self): + """ + **[Required]** Gets the db_servers of this RemoveVirtualMachineFromCloudVmClusterDetails. + The list of ExaCS DB servers for the cluster to be removed. + + + :return: The db_servers of this RemoveVirtualMachineFromCloudVmClusterDetails. + :rtype: list[oci.database.models.CloudDbServerDetails] + """ + return self._db_servers + + @db_servers.setter + def db_servers(self, db_servers): + """ + Sets the db_servers of this RemoveVirtualMachineFromCloudVmClusterDetails. + The list of ExaCS DB servers for the cluster to be removed. + + + :param db_servers: The db_servers of this RemoveVirtualMachineFromCloudVmClusterDetails. + :type: list[oci.database.models.CloudDbServerDetails] + """ + self._db_servers = db_servers + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/database/models/update_cloud_vm_cluster_details.py b/src/oci/database/models/update_cloud_vm_cluster_details.py index f9500f1481..2c3001f08f 100644 --- a/src/oci/database/models/update_cloud_vm_cluster_details.py +++ b/src/oci/database/models/update_cloud_vm_cluster_details.py @@ -38,6 +38,18 @@ def __init__(self, **kwargs): The value to assign to the ocpu_count property of this UpdateCloudVmClusterDetails. :type ocpu_count: float + :param memory_size_in_gbs: + The value to assign to the memory_size_in_gbs property of this UpdateCloudVmClusterDetails. + :type memory_size_in_gbs: int + + :param db_node_storage_size_in_gbs: + The value to assign to the db_node_storage_size_in_gbs property of this UpdateCloudVmClusterDetails. + :type db_node_storage_size_in_gbs: int + + :param data_storage_size_in_tbs: + The value to assign to the data_storage_size_in_tbs property of this UpdateCloudVmClusterDetails. + :type data_storage_size_in_tbs: float + :param license_model: The value to assign to the license_model property of this UpdateCloudVmClusterDetails. Allowed values for this property are: "LICENSE_INCLUDED", "BRING_YOUR_OWN_LICENSE" @@ -84,6 +96,9 @@ def __init__(self, **kwargs): 'display_name': 'str', 'cpu_core_count': 'int', 'ocpu_count': 'float', + 'memory_size_in_gbs': 'int', + 'db_node_storage_size_in_gbs': 'int', + 'data_storage_size_in_tbs': 'float', 'license_model': 'str', 'ssh_public_keys': 'list[str]', 'update_details': 'UpdateDetails', @@ -100,6 +115,9 @@ def __init__(self, **kwargs): 'display_name': 'displayName', 'cpu_core_count': 'cpuCoreCount', 'ocpu_count': 'ocpuCount', + 'memory_size_in_gbs': 'memorySizeInGBs', + 'db_node_storage_size_in_gbs': 'dbNodeStorageSizeInGBs', + 'data_storage_size_in_tbs': 'dataStorageSizeInTBs', 'license_model': 'licenseModel', 'ssh_public_keys': 'sshPublicKeys', 'update_details': 'updateDetails', @@ -115,6 +133,9 @@ def __init__(self, **kwargs): self._display_name = None self._cpu_core_count = None self._ocpu_count = None + self._memory_size_in_gbs = None + self._db_node_storage_size_in_gbs = None + self._data_storage_size_in_tbs = None self._license_model = None self._ssh_public_keys = None self._update_details = None @@ -198,6 +219,78 @@ def ocpu_count(self, ocpu_count): """ self._ocpu_count = ocpu_count + @property + def memory_size_in_gbs(self): + """ + Gets the memory_size_in_gbs of this UpdateCloudVmClusterDetails. + The memory to be allocated in GBs. + + + :return: The memory_size_in_gbs of this UpdateCloudVmClusterDetails. + :rtype: int + """ + return self._memory_size_in_gbs + + @memory_size_in_gbs.setter + def memory_size_in_gbs(self, memory_size_in_gbs): + """ + Sets the memory_size_in_gbs of this UpdateCloudVmClusterDetails. + The memory to be allocated in GBs. + + + :param memory_size_in_gbs: The memory_size_in_gbs of this UpdateCloudVmClusterDetails. + :type: int + """ + self._memory_size_in_gbs = memory_size_in_gbs + + @property + def db_node_storage_size_in_gbs(self): + """ + Gets the db_node_storage_size_in_gbs of this UpdateCloudVmClusterDetails. + The local node storage to be allocated in GBs. + + + :return: The db_node_storage_size_in_gbs of this UpdateCloudVmClusterDetails. + :rtype: int + """ + return self._db_node_storage_size_in_gbs + + @db_node_storage_size_in_gbs.setter + def db_node_storage_size_in_gbs(self, db_node_storage_size_in_gbs): + """ + Sets the db_node_storage_size_in_gbs of this UpdateCloudVmClusterDetails. + The local node storage to be allocated in GBs. + + + :param db_node_storage_size_in_gbs: The db_node_storage_size_in_gbs of this UpdateCloudVmClusterDetails. + :type: int + """ + self._db_node_storage_size_in_gbs = db_node_storage_size_in_gbs + + @property + def data_storage_size_in_tbs(self): + """ + Gets the data_storage_size_in_tbs of this UpdateCloudVmClusterDetails. + The data disk group size to be allocated in TBs. + + + :return: The data_storage_size_in_tbs of this UpdateCloudVmClusterDetails. + :rtype: float + """ + return self._data_storage_size_in_tbs + + @data_storage_size_in_tbs.setter + def data_storage_size_in_tbs(self, data_storage_size_in_tbs): + """ + Sets the data_storage_size_in_tbs of this UpdateCloudVmClusterDetails. + The data disk group size to be allocated in TBs. + + + :param data_storage_size_in_tbs: The data_storage_size_in_tbs of this UpdateCloudVmClusterDetails. + :type: float + """ + self._data_storage_size_in_tbs = data_storage_size_in_tbs + @property def license_model(self): """ diff --git a/src/oci/resource_manager/models/__init__.py b/src/oci/resource_manager/models/__init__.py index cf9d109943..708c01329b 100644 --- a/src/oci/resource_manager/models/__init__.py +++ b/src/oci/resource_manager/models/__init__.py @@ -7,6 +7,8 @@ from .apply_job_operation_details import ApplyJobOperationDetails from .apply_job_operation_details_summary import ApplyJobOperationDetailsSummary from .apply_job_plan_resolution import ApplyJobPlanResolution +from .apply_rollback_job_operation_details import ApplyRollbackJobOperationDetails +from .apply_rollback_job_operation_details_summary import ApplyRollbackJobOperationDetailsSummary from .cancellation_details import CancellationDetails from .change_configuration_source_provider_compartment_details import ChangeConfigurationSourceProviderCompartmentDetails from .change_private_endpoint_compartment_details import ChangePrivateEndpointCompartmentDetails @@ -19,6 +21,7 @@ from .configuration_source_provider_collection import ConfigurationSourceProviderCollection from .configuration_source_provider_summary import ConfigurationSourceProviderSummary from .create_apply_job_operation_details import CreateApplyJobOperationDetails +from .create_apply_rollback_job_operation_details import CreateApplyRollbackJobOperationDetails from .create_compartment_config_source_details import CreateCompartmentConfigSourceDetails from .create_config_source_details import CreateConfigSourceDetails from .create_configuration_source_provider_details import CreateConfigurationSourceProviderDetails @@ -31,6 +34,7 @@ from .create_job_operation_details import CreateJobOperationDetails from .create_object_storage_config_source_details import CreateObjectStorageConfigSourceDetails from .create_plan_job_operation_details import CreatePlanJobOperationDetails +from .create_plan_rollback_job_operation_details import CreatePlanRollbackJobOperationDetails from .create_private_endpoint_details import CreatePrivateEndpointDetails from .create_stack_details import CreateStackDetails from .create_stack_template_config_source_details import CreateStackTemplateConfigSourceDetails @@ -60,6 +64,8 @@ from .object_storage_config_source_record import ObjectStorageConfigSourceRecord from .plan_job_operation_details import PlanJobOperationDetails from .plan_job_operation_details_summary import PlanJobOperationDetailsSummary +from .plan_rollback_job_operation_details import PlanRollbackJobOperationDetails +from .plan_rollback_job_operation_details_summary import PlanRollbackJobOperationDetailsSummary from .private_endpoint import PrivateEndpoint from .private_endpoint_collection import PrivateEndpointCollection from .private_endpoint_summary import PrivateEndpointSummary @@ -107,6 +113,8 @@ "ApplyJobOperationDetails": ApplyJobOperationDetails, "ApplyJobOperationDetailsSummary": ApplyJobOperationDetailsSummary, "ApplyJobPlanResolution": ApplyJobPlanResolution, + "ApplyRollbackJobOperationDetails": ApplyRollbackJobOperationDetails, + "ApplyRollbackJobOperationDetailsSummary": ApplyRollbackJobOperationDetailsSummary, "CancellationDetails": CancellationDetails, "ChangeConfigurationSourceProviderCompartmentDetails": ChangeConfigurationSourceProviderCompartmentDetails, "ChangePrivateEndpointCompartmentDetails": ChangePrivateEndpointCompartmentDetails, @@ -119,6 +127,7 @@ "ConfigurationSourceProviderCollection": ConfigurationSourceProviderCollection, "ConfigurationSourceProviderSummary": ConfigurationSourceProviderSummary, "CreateApplyJobOperationDetails": CreateApplyJobOperationDetails, + "CreateApplyRollbackJobOperationDetails": CreateApplyRollbackJobOperationDetails, "CreateCompartmentConfigSourceDetails": CreateCompartmentConfigSourceDetails, "CreateConfigSourceDetails": CreateConfigSourceDetails, "CreateConfigurationSourceProviderDetails": CreateConfigurationSourceProviderDetails, @@ -131,6 +140,7 @@ "CreateJobOperationDetails": CreateJobOperationDetails, "CreateObjectStorageConfigSourceDetails": CreateObjectStorageConfigSourceDetails, "CreatePlanJobOperationDetails": CreatePlanJobOperationDetails, + "CreatePlanRollbackJobOperationDetails": CreatePlanRollbackJobOperationDetails, "CreatePrivateEndpointDetails": CreatePrivateEndpointDetails, "CreateStackDetails": CreateStackDetails, "CreateStackTemplateConfigSourceDetails": CreateStackTemplateConfigSourceDetails, @@ -160,6 +170,8 @@ "ObjectStorageConfigSourceRecord": ObjectStorageConfigSourceRecord, "PlanJobOperationDetails": PlanJobOperationDetails, "PlanJobOperationDetailsSummary": PlanJobOperationDetailsSummary, + "PlanRollbackJobOperationDetails": PlanRollbackJobOperationDetails, + "PlanRollbackJobOperationDetailsSummary": PlanRollbackJobOperationDetailsSummary, "PrivateEndpoint": PrivateEndpoint, "PrivateEndpointCollection": PrivateEndpointCollection, "PrivateEndpointSummary": PrivateEndpointSummary, diff --git a/src/oci/resource_manager/models/apply_rollback_job_operation_details.py b/src/oci/resource_manager/models/apply_rollback_job_operation_details.py new file mode 100644 index 0000000000..feae514048 --- /dev/null +++ b/src/oci/resource_manager/models/apply_rollback_job_operation_details.py @@ -0,0 +1,201 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .job_operation_details import JobOperationDetails +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ApplyRollbackJobOperationDetails(JobOperationDetails): + """ + Job details that are specific to an apply rollback job. For more information about apply rollback jobs, see + `Creating an Apply Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-apply-rollback.htm + """ + + #: A constant which can be used with the execution_plan_rollback_strategy property of a ApplyRollbackJobOperationDetails. + #: This constant has a value of "FROM_PLAN_ROLLBACK_JOB_ID" + EXECUTION_PLAN_ROLLBACK_STRATEGY_FROM_PLAN_ROLLBACK_JOB_ID = "FROM_PLAN_ROLLBACK_JOB_ID" + + #: A constant which can be used with the execution_plan_rollback_strategy property of a ApplyRollbackJobOperationDetails. + #: This constant has a value of "FROM_LATEST_PLAN_ROLLBACK_JOB_ID" + EXECUTION_PLAN_ROLLBACK_STRATEGY_FROM_LATEST_PLAN_ROLLBACK_JOB_ID = "FROM_LATEST_PLAN_ROLLBACK_JOB_ID" + + #: A constant which can be used with the execution_plan_rollback_strategy property of a ApplyRollbackJobOperationDetails. + #: This constant has a value of "AUTO_APPROVED" + EXECUTION_PLAN_ROLLBACK_STRATEGY_AUTO_APPROVED = "AUTO_APPROVED" + + def __init__(self, **kwargs): + """ + Initializes a new ApplyRollbackJobOperationDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.ApplyRollbackJobOperationDetails.operation` attribute + of this class is ``APPLY_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this ApplyRollbackJobOperationDetails. + :type operation: str + + :param terraform_advanced_options: + The value to assign to the terraform_advanced_options property of this ApplyRollbackJobOperationDetails. + :type terraform_advanced_options: oci.resource_manager.models.TerraformAdvancedOptions + + :param execution_plan_rollback_strategy: + The value to assign to the execution_plan_rollback_strategy property of this ApplyRollbackJobOperationDetails. + Allowed values for this property are: "FROM_PLAN_ROLLBACK_JOB_ID", "FROM_LATEST_PLAN_ROLLBACK_JOB_ID", "AUTO_APPROVED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + :type execution_plan_rollback_strategy: str + + :param execution_plan_rollback_job_id: + The value to assign to the execution_plan_rollback_job_id property of this ApplyRollbackJobOperationDetails. + :type execution_plan_rollback_job_id: str + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this ApplyRollbackJobOperationDetails. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'terraform_advanced_options': 'TerraformAdvancedOptions', + 'execution_plan_rollback_strategy': 'str', + 'execution_plan_rollback_job_id': 'str', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'terraform_advanced_options': 'terraformAdvancedOptions', + 'execution_plan_rollback_strategy': 'executionPlanRollbackStrategy', + 'execution_plan_rollback_job_id': 'executionPlanRollbackJobId', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._terraform_advanced_options = None + self._execution_plan_rollback_strategy = None + self._execution_plan_rollback_job_id = None + self._target_rollback_job_id = None + self._operation = 'APPLY_ROLLBACK' + + @property + def terraform_advanced_options(self): + """ + Gets the terraform_advanced_options of this ApplyRollbackJobOperationDetails. + + :return: The terraform_advanced_options of this ApplyRollbackJobOperationDetails. + :rtype: oci.resource_manager.models.TerraformAdvancedOptions + """ + return self._terraform_advanced_options + + @terraform_advanced_options.setter + def terraform_advanced_options(self, terraform_advanced_options): + """ + Sets the terraform_advanced_options of this ApplyRollbackJobOperationDetails. + + :param terraform_advanced_options: The terraform_advanced_options of this ApplyRollbackJobOperationDetails. + :type: oci.resource_manager.models.TerraformAdvancedOptions + """ + self._terraform_advanced_options = terraform_advanced_options + + @property + def execution_plan_rollback_strategy(self): + """ + **[Required]** Gets the execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetails. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback. + + Allowed values for this property are: "FROM_PLAN_ROLLBACK_JOB_ID", "FROM_LATEST_PLAN_ROLLBACK_JOB_ID", "AUTO_APPROVED", 'UNKNOWN_ENUM_VALUE'. + Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. + + + :return: The execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._execution_plan_rollback_strategy + + @execution_plan_rollback_strategy.setter + def execution_plan_rollback_strategy(self, execution_plan_rollback_strategy): + """ + Sets the execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetails. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback. + + + :param execution_plan_rollback_strategy: The execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetails. + :type: str + """ + allowed_values = ["FROM_PLAN_ROLLBACK_JOB_ID", "FROM_LATEST_PLAN_ROLLBACK_JOB_ID", "AUTO_APPROVED"] + if not value_allowed_none_or_none_sentinel(execution_plan_rollback_strategy, allowed_values): + execution_plan_rollback_strategy = 'UNKNOWN_ENUM_VALUE' + self._execution_plan_rollback_strategy = execution_plan_rollback_strategy + + @property + def execution_plan_rollback_job_id(self): + """ + Gets the execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetails. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._execution_plan_rollback_job_id + + @execution_plan_rollback_job_id.setter + def execution_plan_rollback_job_id(self, execution_plan_rollback_job_id): + """ + Sets the execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetails. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param execution_plan_rollback_job_id: The execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetails. + :type: str + """ + self._execution_plan_rollback_job_id = execution_plan_rollback_job_id + + @property + def target_rollback_job_id(self): + """ + Gets the target_rollback_job_id of this ApplyRollbackJobOperationDetails. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this ApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this ApplyRollbackJobOperationDetails. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this ApplyRollbackJobOperationDetails. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/apply_rollback_job_operation_details_summary.py b/src/oci/resource_manager/models/apply_rollback_job_operation_details_summary.py new file mode 100644 index 0000000000..e166244935 --- /dev/null +++ b/src/oci/resource_manager/models/apply_rollback_job_operation_details_summary.py @@ -0,0 +1,154 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .job_operation_details_summary import JobOperationDetailsSummary +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class ApplyRollbackJobOperationDetailsSummary(JobOperationDetailsSummary): + """ + Job details that are specific to an apply rollback job. For more information about apply rollback jobs, see + `Creating an Apply Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-apply-rollback.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new ApplyRollbackJobOperationDetailsSummary object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary.operation` attribute + of this class is ``APPLY_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this ApplyRollbackJobOperationDetailsSummary. + :type operation: str + + :param execution_plan_rollback_strategy: + The value to assign to the execution_plan_rollback_strategy property of this ApplyRollbackJobOperationDetailsSummary. + :type execution_plan_rollback_strategy: str + + :param execution_plan_rollback_job_id: + The value to assign to the execution_plan_rollback_job_id property of this ApplyRollbackJobOperationDetailsSummary. + :type execution_plan_rollback_job_id: str + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this ApplyRollbackJobOperationDetailsSummary. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'execution_plan_rollback_strategy': 'str', + 'execution_plan_rollback_job_id': 'str', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'execution_plan_rollback_strategy': 'executionPlanRollbackStrategy', + 'execution_plan_rollback_job_id': 'executionPlanRollbackJobId', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._execution_plan_rollback_strategy = None + self._execution_plan_rollback_job_id = None + self._target_rollback_job_id = None + self._operation = 'APPLY_ROLLBACK' + + @property + def execution_plan_rollback_strategy(self): + """ + **[Required]** Gets the execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetailsSummary. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback. + + + :return: The execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetailsSummary. + :rtype: str + """ + return self._execution_plan_rollback_strategy + + @execution_plan_rollback_strategy.setter + def execution_plan_rollback_strategy(self, execution_plan_rollback_strategy): + """ + Sets the execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetailsSummary. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback. + + + :param execution_plan_rollback_strategy: The execution_plan_rollback_strategy of this ApplyRollbackJobOperationDetailsSummary. + :type: str + """ + self._execution_plan_rollback_strategy = execution_plan_rollback_strategy + + @property + def execution_plan_rollback_job_id(self): + """ + Gets the execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + :rtype: str + """ + return self._execution_plan_rollback_job_id + + @execution_plan_rollback_job_id.setter + def execution_plan_rollback_job_id(self, execution_plan_rollback_job_id): + """ + Sets the execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param execution_plan_rollback_job_id: The execution_plan_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + :type: str + """ + self._execution_plan_rollback_job_id = execution_plan_rollback_job_id + + @property + def target_rollback_job_id(self): + """ + Gets the target_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this ApplyRollbackJobOperationDetailsSummary. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/cancellation_details.py b/src/oci/resource_manager/models/cancellation_details.py index 999ee2a4dd..66e4083953 100644 --- a/src/oci/resource_manager/models/cancellation_details.py +++ b/src/oci/resource_manager/models/cancellation_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CancellationDetails(object): """ - Defines the cancellation details of the job. + Cancellation details for a job. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/change_configuration_source_provider_compartment_details.py b/src/oci/resource_manager/models/change_configuration_source_provider_compartment_details.py index efbce9b22c..b976791219 100644 --- a/src/oci/resource_manager/models/change_configuration_source_provider_compartment_details.py +++ b/src/oci/resource_manager/models/change_configuration_source_provider_compartment_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ChangeConfigurationSourceProviderCompartmentDetails(object): """ - The details for moving a configuration source provider to a different compartment. + Compartment details for moving a configuration source provider. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/change_private_endpoint_compartment_details.py b/src/oci/resource_manager/models/change_private_endpoint_compartment_details.py index 948056a1ef..c381eb943f 100644 --- a/src/oci/resource_manager/models/change_private_endpoint_compartment_details.py +++ b/src/oci/resource_manager/models/change_private_endpoint_compartment_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ChangePrivateEndpointCompartmentDetails(object): """ - The details for moving a private endpoint to a different compartment. + Compartment details for moving a private endpoint. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/change_stack_compartment_details.py b/src/oci/resource_manager/models/change_stack_compartment_details.py index 367aec344b..8415956f8e 100644 --- a/src/oci/resource_manager/models/change_stack_compartment_details.py +++ b/src/oci/resource_manager/models/change_stack_compartment_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ChangeStackCompartmentDetails(object): """ - Defines the requirements and properties of changeStackCompartment operation. + Compartment details for moving a stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/change_template_compartment_details.py b/src/oci/resource_manager/models/change_template_compartment_details.py index c4753ff858..3bfbda3f9c 100644 --- a/src/oci/resource_manager/models/change_template_compartment_details.py +++ b/src/oci/resource_manager/models/change_template_compartment_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ChangeTemplateCompartmentDetails(object): """ - The details for moving a template to a different compartment. + Compartment details for moving a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/configuration_source_provider_summary.py b/src/oci/resource_manager/models/configuration_source_provider_summary.py index 24f75ff8ee..bf57e0e760 100644 --- a/src/oci/resource_manager/models/configuration_source_provider_summary.py +++ b/src/oci/resource_manager/models/configuration_source_provider_summary.py @@ -291,7 +291,8 @@ def lifecycle_state(self, lifecycle_state): def config_source_provider_type(self): """ **[Required]** Gets the config_source_provider_type of this ConfigurationSourceProviderSummary. - The type of configuration source provider. The `GITLAB_ACCESS_TOKEN` type corresponds to GitLab. + The type of configuration source provider. + The `GITLAB_ACCESS_TOKEN` type corresponds to GitLab. The `GITHUB_ACCESS_TOKEN` type corresponds to GitHub. @@ -304,7 +305,8 @@ def config_source_provider_type(self): def config_source_provider_type(self, config_source_provider_type): """ Sets the config_source_provider_type of this ConfigurationSourceProviderSummary. - The type of configuration source provider. The `GITLAB_ACCESS_TOKEN` type corresponds to GitLab. + The type of configuration source provider. + The `GITLAB_ACCESS_TOKEN` type corresponds to GitLab. The `GITHUB_ACCESS_TOKEN` type corresponds to GitHub. diff --git a/src/oci/resource_manager/models/create_apply_rollback_job_operation_details.py b/src/oci/resource_manager/models/create_apply_rollback_job_operation_details.py new file mode 100644 index 0000000000..d86a2681ae --- /dev/null +++ b/src/oci/resource_manager/models/create_apply_rollback_job_operation_details.py @@ -0,0 +1,188 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .create_job_operation_details import CreateJobOperationDetails +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CreateApplyRollbackJobOperationDetails(CreateJobOperationDetails): + """ + Job details that are specific to an apply rollback job. For more information about apply rollback jobs, see + `Creating an Apply Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-apply-rollback.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreateApplyRollbackJobOperationDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.CreateApplyRollbackJobOperationDetails.operation` attribute + of this class is ``APPLY_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this CreateApplyRollbackJobOperationDetails. + :type operation: str + + :param is_provider_upgrade_required: + The value to assign to the is_provider_upgrade_required property of this CreateApplyRollbackJobOperationDetails. + :type is_provider_upgrade_required: bool + + :param terraform_advanced_options: + The value to assign to the terraform_advanced_options property of this CreateApplyRollbackJobOperationDetails. + :type terraform_advanced_options: oci.resource_manager.models.TerraformAdvancedOptions + + :param execution_plan_rollback_strategy: + The value to assign to the execution_plan_rollback_strategy property of this CreateApplyRollbackJobOperationDetails. + :type execution_plan_rollback_strategy: str + + :param execution_plan_rollback_job_id: + The value to assign to the execution_plan_rollback_job_id property of this CreateApplyRollbackJobOperationDetails. + :type execution_plan_rollback_job_id: str + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this CreateApplyRollbackJobOperationDetails. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'is_provider_upgrade_required': 'bool', + 'terraform_advanced_options': 'TerraformAdvancedOptions', + 'execution_plan_rollback_strategy': 'str', + 'execution_plan_rollback_job_id': 'str', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'is_provider_upgrade_required': 'isProviderUpgradeRequired', + 'terraform_advanced_options': 'terraformAdvancedOptions', + 'execution_plan_rollback_strategy': 'executionPlanRollbackStrategy', + 'execution_plan_rollback_job_id': 'executionPlanRollbackJobId', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._is_provider_upgrade_required = None + self._terraform_advanced_options = None + self._execution_plan_rollback_strategy = None + self._execution_plan_rollback_job_id = None + self._target_rollback_job_id = None + self._operation = 'APPLY_ROLLBACK' + + @property + def terraform_advanced_options(self): + """ + Gets the terraform_advanced_options of this CreateApplyRollbackJobOperationDetails. + + :return: The terraform_advanced_options of this CreateApplyRollbackJobOperationDetails. + :rtype: oci.resource_manager.models.TerraformAdvancedOptions + """ + return self._terraform_advanced_options + + @terraform_advanced_options.setter + def terraform_advanced_options(self, terraform_advanced_options): + """ + Sets the terraform_advanced_options of this CreateApplyRollbackJobOperationDetails. + + :param terraform_advanced_options: The terraform_advanced_options of this CreateApplyRollbackJobOperationDetails. + :type: oci.resource_manager.models.TerraformAdvancedOptions + """ + self._terraform_advanced_options = terraform_advanced_options + + @property + def execution_plan_rollback_strategy(self): + """ + **[Required]** Gets the execution_plan_rollback_strategy of this CreateApplyRollbackJobOperationDetails. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback job. + + + :return: The execution_plan_rollback_strategy of this CreateApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._execution_plan_rollback_strategy + + @execution_plan_rollback_strategy.setter + def execution_plan_rollback_strategy(self, execution_plan_rollback_strategy): + """ + Sets the execution_plan_rollback_strategy of this CreateApplyRollbackJobOperationDetails. + Specifies the source of the execution plan for rollback to apply. + Use `AUTO_APPROVED` to run the job without an execution plan for rollback job. + + + :param execution_plan_rollback_strategy: The execution_plan_rollback_strategy of this CreateApplyRollbackJobOperationDetails. + :type: str + """ + self._execution_plan_rollback_strategy = execution_plan_rollback_strategy + + @property + def execution_plan_rollback_job_id(self): + """ + Gets the execution_plan_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The execution_plan_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._execution_plan_rollback_job_id + + @execution_plan_rollback_job_id.setter + def execution_plan_rollback_job_id(self, execution_plan_rollback_job_id): + """ + Sets the execution_plan_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + The `OCID`__ of a plan rollback job, for use when specifying `\"FROM_PLAN_ROLLBACK_JOB_ID\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param execution_plan_rollback_job_id: The execution_plan_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + :type: str + """ + self._execution_plan_rollback_job_id = execution_plan_rollback_job_id + + @property + def target_rollback_job_id(self): + """ + Gets the target_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + The `OCID`__ of a successful apply job, for use when specifying `\"AUTO_APPROVED\"` as the `executionPlanRollbackStrategy`. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this CreateApplyRollbackJobOperationDetails. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/create_compartment_config_source_details.py b/src/oci/resource_manager/models/create_compartment_config_source_details.py index 0b812355a4..2394eb2d97 100644 --- a/src/oci/resource_manager/models/create_compartment_config_source_details.py +++ b/src/oci/resource_manager/models/create_compartment_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateCompartmentConfigSourceDetails(CreateConfigSourceDetails): """ - Property details for uploading the specified compartment as the configuration source. + Creation details for a configuration source based on the specified compartment. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_config_source_details.py b/src/oci/resource_manager/models/create_config_source_details.py index 1f063817c6..bc775cd62f 100644 --- a/src/oci/resource_manager/models/create_config_source_details.py +++ b/src/oci/resource_manager/models/create_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateConfigSourceDetails(object): """ - Property details for the configuration source used for the stack. + Creation details for a configuration source used with the stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_configuration_source_provider_details.py b/src/oci/resource_manager/models/create_configuration_source_provider_details.py index 067f4a3245..0b61c798d0 100644 --- a/src/oci/resource_manager/models/create_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/create_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateConfigurationSourceProviderDetails(object): """ - The details for creating a configuration source provider. + Creation details for a configuration source provider. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_git_config_source_details.py b/src/oci/resource_manager/models/create_git_config_source_details.py index e8594b8819..0fd2ab9a8c 100644 --- a/src/oci/resource_manager/models/create_git_config_source_details.py +++ b/src/oci/resource_manager/models/create_git_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateGitConfigSourceDetails(CreateConfigSourceDetails): """ - Details for uploading the configuration Git information. + Creation details for configuration Git information. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_github_access_token_configuration_source_provider_details.py b/src/oci/resource_manager/models/create_github_access_token_configuration_source_provider_details.py index 7c4d2ee464..c97b3247c0 100644 --- a/src/oci/resource_manager/models/create_github_access_token_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/create_github_access_token_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateGithubAccessTokenConfigurationSourceProviderDetails(CreateConfigurationSourceProviderDetails): """ - The details for creating a configuration source provider of the type `GITHUB_ACCESS_TOKEN`. + Creation details for a configuration source provider of the type `GITHUB_ACCESS_TOKEN`. This type corresponds to a configuration source provider in GitHub that is authenticated with a personal access token. """ diff --git a/src/oci/resource_manager/models/create_gitlab_access_token_configuration_source_provider_details.py b/src/oci/resource_manager/models/create_gitlab_access_token_configuration_source_provider_details.py index 7e4cb668b4..e5348d5ab1 100644 --- a/src/oci/resource_manager/models/create_gitlab_access_token_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/create_gitlab_access_token_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateGitlabAccessTokenConfigurationSourceProviderDetails(CreateConfigurationSourceProviderDetails): """ - The details for creating a configuration source provider of the type `GITLAB_ACCESS_TOKEN`. + Creation details for a configuration source provider of the type `GITLAB_ACCESS_TOKEN`. This type corresponds to a configuration source provider in GitLab that is authenticated with a personal access token. """ diff --git a/src/oci/resource_manager/models/create_job_details.py b/src/oci/resource_manager/models/create_job_details.py index cb30d20d45..c560a47843 100644 --- a/src/oci/resource_manager/models/create_job_details.py +++ b/src/oci/resource_manager/models/create_job_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateJobDetails(object): """ - Defines the requirements and properties of a job to create and run against the specified stack. + Creation details for a job for running inside the specified stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_job_operation_details.py b/src/oci/resource_manager/models/create_job_operation_details.py index 4100452116..97d8d66684 100644 --- a/src/oci/resource_manager/models/create_job_operation_details.py +++ b/src/oci/resource_manager/models/create_job_operation_details.py @@ -19,6 +19,8 @@ def __init__(self, **kwargs): to a service operations then you should favor using a subclass over the base class: * :class:`~oci.resource_manager.models.CreateImportTfStateJobOperationDetails` + * :class:`~oci.resource_manager.models.CreatePlanRollbackJobOperationDetails` + * :class:`~oci.resource_manager.models.CreateApplyRollbackJobOperationDetails` * :class:`~oci.resource_manager.models.CreateApplyJobOperationDetails` * :class:`~oci.resource_manager.models.CreatePlanJobOperationDetails` * :class:`~oci.resource_manager.models.CreateDestroyJobOperationDetails` @@ -58,6 +60,12 @@ def get_subtype(object_dictionary): if type == 'IMPORT_TF_STATE': return 'CreateImportTfStateJobOperationDetails' + if type == 'PLAN_ROLLBACK': + return 'CreatePlanRollbackJobOperationDetails' + + if type == 'APPLY_ROLLBACK': + return 'CreateApplyRollbackJobOperationDetails' + if type == 'APPLY': return 'CreateApplyJobOperationDetails' diff --git a/src/oci/resource_manager/models/create_object_storage_config_source_details.py b/src/oci/resource_manager/models/create_object_storage_config_source_details.py index caa7e6caef..3c80449dd7 100644 --- a/src/oci/resource_manager/models/create_object_storage_config_source_details.py +++ b/src/oci/resource_manager/models/create_object_storage_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateObjectStorageConfigSourceDetails(CreateConfigSourceDetails): """ - Details for the Object Storage bucket that contains Terraform configuration files. + Creation details for an Object Storage bucket that contains Terraform configuration files. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_plan_rollback_job_operation_details.py b/src/oci/resource_manager/models/create_plan_rollback_job_operation_details.py new file mode 100644 index 0000000000..9b88857ca9 --- /dev/null +++ b/src/oci/resource_manager/models/create_plan_rollback_job_operation_details.py @@ -0,0 +1,120 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .create_job_operation_details import CreateJobOperationDetails +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class CreatePlanRollbackJobOperationDetails(CreateJobOperationDetails): + """ + Job details that are specific to a plan rollback job. For more information about plan rollback jobs, + see `Creating a Plan Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-plan-rollback.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new CreatePlanRollbackJobOperationDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.CreatePlanRollbackJobOperationDetails.operation` attribute + of this class is ``PLAN_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this CreatePlanRollbackJobOperationDetails. + :type operation: str + + :param is_provider_upgrade_required: + The value to assign to the is_provider_upgrade_required property of this CreatePlanRollbackJobOperationDetails. + :type is_provider_upgrade_required: bool + + :param terraform_advanced_options: + The value to assign to the terraform_advanced_options property of this CreatePlanRollbackJobOperationDetails. + :type terraform_advanced_options: oci.resource_manager.models.TerraformAdvancedOptions + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this CreatePlanRollbackJobOperationDetails. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'is_provider_upgrade_required': 'bool', + 'terraform_advanced_options': 'TerraformAdvancedOptions', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'is_provider_upgrade_required': 'isProviderUpgradeRequired', + 'terraform_advanced_options': 'terraformAdvancedOptions', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._is_provider_upgrade_required = None + self._terraform_advanced_options = None + self._target_rollback_job_id = None + self._operation = 'PLAN_ROLLBACK' + + @property + def terraform_advanced_options(self): + """ + Gets the terraform_advanced_options of this CreatePlanRollbackJobOperationDetails. + + :return: The terraform_advanced_options of this CreatePlanRollbackJobOperationDetails. + :rtype: oci.resource_manager.models.TerraformAdvancedOptions + """ + return self._terraform_advanced_options + + @terraform_advanced_options.setter + def terraform_advanced_options(self, terraform_advanced_options): + """ + Sets the terraform_advanced_options of this CreatePlanRollbackJobOperationDetails. + + :param terraform_advanced_options: The terraform_advanced_options of this CreatePlanRollbackJobOperationDetails. + :type: oci.resource_manager.models.TerraformAdvancedOptions + """ + self._terraform_advanced_options = terraform_advanced_options + + @property + def target_rollback_job_id(self): + """ + **[Required]** Gets the target_rollback_job_id of this CreatePlanRollbackJobOperationDetails. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this CreatePlanRollbackJobOperationDetails. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this CreatePlanRollbackJobOperationDetails. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this CreatePlanRollbackJobOperationDetails. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/create_stack_details.py b/src/oci/resource_manager/models/create_stack_details.py index ca8adc7eb0..411f8776d7 100644 --- a/src/oci/resource_manager/models/create_stack_details.py +++ b/src/oci/resource_manager/models/create_stack_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateStackDetails(object): """ - The configuration details for creating a stack. + Creation details for a stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_stack_template_config_source_details.py b/src/oci/resource_manager/models/create_stack_template_config_source_details.py index 8e421ac173..2b350566ef 100644 --- a/src/oci/resource_manager/models/create_stack_template_config_source_details.py +++ b/src/oci/resource_manager/models/create_stack_template_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateStackTemplateConfigSourceDetails(CreateConfigSourceDetails): """ - The template to use as the source of the Terraform configuration. + Creation details for a template to use as the source of the Terraform configuration. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_template_config_source_details.py b/src/oci/resource_manager/models/create_template_config_source_details.py index 7997a398b8..e2fa06cd2c 100644 --- a/src/oci/resource_manager/models/create_template_config_source_details.py +++ b/src/oci/resource_manager/models/create_template_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateTemplateConfigSourceDetails(object): """ - Property details for the configuration source used for the template. + Creation details for a configuration source used for a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_template_details.py b/src/oci/resource_manager/models/create_template_details.py index 1e89bcd81e..bef7c30604 100644 --- a/src/oci/resource_manager/models/create_template_details.py +++ b/src/oci/resource_manager/models/create_template_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateTemplateDetails(object): """ - The configuration details for creating a template. + Creation details for a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_template_zip_upload_config_source_details.py b/src/oci/resource_manager/models/create_template_zip_upload_config_source_details.py index 1176fc6e48..d0b374c8a5 100644 --- a/src/oci/resource_manager/models/create_template_zip_upload_config_source_details.py +++ b/src/oci/resource_manager/models/create_template_zip_upload_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateTemplateZipUploadConfigSourceDetails(CreateTemplateConfigSourceDetails): """ - Property details for uploading the zip file for template. + Creation details for a zip file used for a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/create_zip_upload_config_source_details.py b/src/oci/resource_manager/models/create_zip_upload_config_source_details.py index 52a7669891..f549241fbe 100644 --- a/src/oci/resource_manager/models/create_zip_upload_config_source_details.py +++ b/src/oci/resource_manager/models/create_zip_upload_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class CreateZipUploadConfigSourceDetails(CreateConfigSourceDetails): """ - Property details for uploading the configuration zip file. + Creation details for a Terraform configuration zip file. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/custom_terraform_provider.py b/src/oci/resource_manager/models/custom_terraform_provider.py index bf25d6533c..dd4c6bcfbb 100644 --- a/src/oci/resource_manager/models/custom_terraform_provider.py +++ b/src/oci/resource_manager/models/custom_terraform_provider.py @@ -12,12 +12,12 @@ class CustomTerraformProvider(object): """ Location information about custom Terraform providers for a stack. For more information, see `Custom Providers`__. - Note: Older stacks that use Terraform version 12.x or 13.x must be explicitly updated to use Terraform Registry (`isThirdPartyProviderExperienceEnabled=true`). + Note: Older stacks must be explicitly updated to use Terraform Registry (`isThirdPartyProviderExperienceEnabled=true`). See :func:`update_stack`. For more information, see - `To use Terraform Registry with an older stack`__. + `Using Terraform Registry with Older Stacks`__. __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#features__custom-providers - __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/managingstacksandjobs.htm#use-tf-reg + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/update-stack-tf-reg.htm """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/detect_stack_drift_details.py b/src/oci/resource_manager/models/detect_stack_drift_details.py index d846d8c2a4..33036ba6a8 100644 --- a/src/oci/resource_manager/models/detect_stack_drift_details.py +++ b/src/oci/resource_manager/models/detect_stack_drift_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class DetectStackDriftDetails(object): """ - The details for detecting drift in a stack + Details for detecting drift in a stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/job.py b/src/oci/resource_manager/models/job.py index cd613bde26..d1046bfadc 100644 --- a/src/oci/resource_manager/models/job.py +++ b/src/oci/resource_manager/models/job.py @@ -10,15 +10,15 @@ @init_model_state_from_kwargs class Job(object): """ - The properties that define a job. Jobs perform the actions that are defined in your configuration. - - **Plan job**. A plan job takes your Terraform configuration, parses it, and creates an execution plan. - - **Apply job**. The apply job takes your execution plan, applies it to the associated stack, then executes - the configuration's instructions. - - **Destroy job**. To clean up the infrastructure controlled by the stack, you run a destroy job. - A destroy job does not delete the stack or associated job resources, - but instead releases the resources managed by the stack. - - **Import_TF_State job**. An import Terraform state job takes a Terraform state file and sets it as the current - state of the stack. This is used to migrate local Terraform environments to Resource Manager. + The properties of a job. + A job performs the actions that are defined in your Terraform configuration. + For instructions on managing jobs, see + `Managing Jobs`__. + For more information about jobs, see + `Key Concepts`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/jobs.htm + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#concepts__jobdefinition """ #: A constant which can be used with the operation property of a Job. @@ -37,6 +37,14 @@ class Job(object): #: This constant has a value of "IMPORT_TF_STATE" OPERATION_IMPORT_TF_STATE = "IMPORT_TF_STATE" + #: A constant which can be used with the operation property of a Job. + #: This constant has a value of "PLAN_ROLLBACK" + OPERATION_PLAN_ROLLBACK = "PLAN_ROLLBACK" + + #: A constant which can be used with the operation property of a Job. + #: This constant has a value of "APPLY_ROLLBACK" + OPERATION_APPLY_ROLLBACK = "APPLY_ROLLBACK" + #: A constant which can be used with the lifecycle_state property of a Job. #: This constant has a value of "ACCEPTED" LIFECYCLE_STATE_ACCEPTED = "ACCEPTED" @@ -84,10 +92,14 @@ def __init__(self, **kwargs): :param operation: The value to assign to the operation property of this Job. - Allowed values for this property are: "PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE", "PLAN_ROLLBACK", "APPLY_ROLLBACK", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. :type operation: str + :param is_third_party_provider_experience_enabled: + The value to assign to the is_third_party_provider_experience_enabled property of this Job. + :type is_third_party_provider_experience_enabled: bool + :param is_provider_upgrade_required: The value to assign to the is_provider_upgrade_required property of this Job. :type is_provider_upgrade_required: bool @@ -153,6 +165,7 @@ def __init__(self, **kwargs): 'compartment_id': 'str', 'display_name': 'str', 'operation': 'str', + 'is_third_party_provider_experience_enabled': 'bool', 'is_provider_upgrade_required': 'bool', 'job_operation_details': 'JobOperationDetails', 'apply_job_plan_resolution': 'ApplyJobPlanResolution', @@ -175,6 +188,7 @@ def __init__(self, **kwargs): 'compartment_id': 'compartmentId', 'display_name': 'displayName', 'operation': 'operation', + 'is_third_party_provider_experience_enabled': 'isThirdPartyProviderExperienceEnabled', 'is_provider_upgrade_required': 'isProviderUpgradeRequired', 'job_operation_details': 'jobOperationDetails', 'apply_job_plan_resolution': 'applyJobPlanResolution', @@ -196,6 +210,7 @@ def __init__(self, **kwargs): self._compartment_id = None self._display_name = None self._operation = None + self._is_third_party_provider_experience_enabled = None self._is_provider_upgrade_required = None self._job_operation_details = None self._apply_job_plan_resolution = None @@ -325,7 +340,7 @@ def operation(self): Gets the operation of this Job. The type of job executing. - Allowed values for this property are: "PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE", 'UNKNOWN_ENUM_VALUE'. + Allowed values for this property are: "PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE", "PLAN_ROLLBACK", "APPLY_ROLLBACK", 'UNKNOWN_ENUM_VALUE'. Any unrecognized values returned by a service will be mapped to 'UNKNOWN_ENUM_VALUE'. @@ -344,11 +359,49 @@ def operation(self, operation): :param operation: The operation of this Job. :type: str """ - allowed_values = ["PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE"] + allowed_values = ["PLAN", "APPLY", "DESTROY", "IMPORT_TF_STATE", "PLAN_ROLLBACK", "APPLY_ROLLBACK"] if not value_allowed_none_or_none_sentinel(operation, allowed_values): operation = 'UNKNOWN_ENUM_VALUE' self._operation = operation + @property + def is_third_party_provider_experience_enabled(self): + """ + Gets the is_third_party_provider_experience_enabled of this Job. + When `true`, the stack sources third-party Terraform providers from + `Terraform Registry`__ and allows + :func:`custom_terraform_provider`. + For more information about stack sourcing of third-party Terraform providers, see + `Third-party Provider Configuration`__. + + __ https://registry.terraform.io/browse/providers + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/terraformconfigresourcemanager.htm#third-party-providers + + + :return: The is_third_party_provider_experience_enabled of this Job. + :rtype: bool + """ + return self._is_third_party_provider_experience_enabled + + @is_third_party_provider_experience_enabled.setter + def is_third_party_provider_experience_enabled(self, is_third_party_provider_experience_enabled): + """ + Sets the is_third_party_provider_experience_enabled of this Job. + When `true`, the stack sources third-party Terraform providers from + `Terraform Registry`__ and allows + :func:`custom_terraform_provider`. + For more information about stack sourcing of third-party Terraform providers, see + `Third-party Provider Configuration`__. + + __ https://registry.terraform.io/browse/providers + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/terraformconfigresourcemanager.htm#third-party-providers + + + :param is_third_party_provider_experience_enabled: The is_third_party_provider_experience_enabled of this Job. + :type: bool + """ + self._is_third_party_provider_experience_enabled = is_third_party_provider_experience_enabled + @property def is_provider_upgrade_required(self): """ diff --git a/src/oci/resource_manager/models/job_operation_details.py b/src/oci/resource_manager/models/job_operation_details.py index 27bd30d8e3..fb993585d4 100644 --- a/src/oci/resource_manager/models/job_operation_details.py +++ b/src/oci/resource_manager/models/job_operation_details.py @@ -20,6 +20,8 @@ def __init__(self, **kwargs): * :class:`~oci.resource_manager.models.ImportTfStateJobOperationDetails` * :class:`~oci.resource_manager.models.PlanJobOperationDetails` + * :class:`~oci.resource_manager.models.ApplyRollbackJobOperationDetails` + * :class:`~oci.resource_manager.models.PlanRollbackJobOperationDetails` * :class:`~oci.resource_manager.models.ApplyJobOperationDetails` * :class:`~oci.resource_manager.models.DestroyJobOperationDetails` @@ -54,6 +56,12 @@ def get_subtype(object_dictionary): if type == 'PLAN': return 'PlanJobOperationDetails' + if type == 'APPLY_ROLLBACK': + return 'ApplyRollbackJobOperationDetails' + + if type == 'PLAN_ROLLBACK': + return 'PlanRollbackJobOperationDetails' + if type == 'APPLY': return 'ApplyJobOperationDetails' diff --git a/src/oci/resource_manager/models/job_operation_details_summary.py b/src/oci/resource_manager/models/job_operation_details_summary.py index dbf7a6e854..51898274d3 100644 --- a/src/oci/resource_manager/models/job_operation_details_summary.py +++ b/src/oci/resource_manager/models/job_operation_details_summary.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class JobOperationDetailsSummary(object): """ - Job details that are specific to the operation type. + A summary of job details that is specific to the operation type. """ def __init__(self, **kwargs): @@ -18,7 +18,9 @@ def __init__(self, **kwargs): Initializes a new JobOperationDetailsSummary object with values from keyword arguments. This class has the following subclasses and if you are using this class as input to a service operations then you should favor using a subclass over the base class: + * :class:`~oci.resource_manager.models.ApplyRollbackJobOperationDetailsSummary` * :class:`~oci.resource_manager.models.ImportTfStateJobOperationDetailsSummary` + * :class:`~oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary` * :class:`~oci.resource_manager.models.PlanJobOperationDetailsSummary` * :class:`~oci.resource_manager.models.DestroyJobOperationDetailsSummary` * :class:`~oci.resource_manager.models.ApplyJobOperationDetailsSummary` @@ -48,9 +50,15 @@ def get_subtype(object_dictionary): """ type = object_dictionary['operation'] + if type == 'APPLY_ROLLBACK': + return 'ApplyRollbackJobOperationDetailsSummary' + if type == 'IMPORT_TF_STATE': return 'ImportTfStateJobOperationDetailsSummary' + if type == 'PLAN_ROLLBACK': + return 'PlanRollbackJobOperationDetailsSummary' + if type == 'PLAN': return 'PlanJobOperationDetailsSummary' diff --git a/src/oci/resource_manager/models/job_summary.py b/src/oci/resource_manager/models/job_summary.py index f0a485f79b..4c480f2d13 100644 --- a/src/oci/resource_manager/models/job_summary.py +++ b/src/oci/resource_manager/models/job_summary.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class JobSummary(object): """ - Returns a listing of all of the specified job's properties and their values. + Summary information for a job. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/plan_rollback_job_operation_details.py b/src/oci/resource_manager/models/plan_rollback_job_operation_details.py new file mode 100644 index 0000000000..81161003b3 --- /dev/null +++ b/src/oci/resource_manager/models/plan_rollback_job_operation_details.py @@ -0,0 +1,113 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .job_operation_details import JobOperationDetails +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class PlanRollbackJobOperationDetails(JobOperationDetails): + """ + Job details that are specific to a plan rollback job. For more information about plan rollback jobs, + see `Creating a Plan Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-plan-rollback.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new PlanRollbackJobOperationDetails object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.PlanRollbackJobOperationDetails.operation` attribute + of this class is ``PLAN_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this PlanRollbackJobOperationDetails. + :type operation: str + + :param terraform_advanced_options: + The value to assign to the terraform_advanced_options property of this PlanRollbackJobOperationDetails. + :type terraform_advanced_options: oci.resource_manager.models.TerraformAdvancedOptions + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this PlanRollbackJobOperationDetails. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'terraform_advanced_options': 'TerraformAdvancedOptions', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'terraform_advanced_options': 'terraformAdvancedOptions', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._terraform_advanced_options = None + self._target_rollback_job_id = None + self._operation = 'PLAN_ROLLBACK' + + @property + def terraform_advanced_options(self): + """ + Gets the terraform_advanced_options of this PlanRollbackJobOperationDetails. + + :return: The terraform_advanced_options of this PlanRollbackJobOperationDetails. + :rtype: oci.resource_manager.models.TerraformAdvancedOptions + """ + return self._terraform_advanced_options + + @terraform_advanced_options.setter + def terraform_advanced_options(self, terraform_advanced_options): + """ + Sets the terraform_advanced_options of this PlanRollbackJobOperationDetails. + + :param terraform_advanced_options: The terraform_advanced_options of this PlanRollbackJobOperationDetails. + :type: oci.resource_manager.models.TerraformAdvancedOptions + """ + self._terraform_advanced_options = terraform_advanced_options + + @property + def target_rollback_job_id(self): + """ + **[Required]** Gets the target_rollback_job_id of this PlanRollbackJobOperationDetails. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this PlanRollbackJobOperationDetails. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this PlanRollbackJobOperationDetails. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this PlanRollbackJobOperationDetails. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/plan_rollback_job_operation_details_summary.py b/src/oci/resource_manager/models/plan_rollback_job_operation_details_summary.py new file mode 100644 index 0000000000..02a0fb3106 --- /dev/null +++ b/src/oci/resource_manager/models/plan_rollback_job_operation_details_summary.py @@ -0,0 +1,86 @@ +# coding: utf-8 +# Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. +# This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. + +from .job_operation_details_summary import JobOperationDetailsSummary +from oci.util import formatted_flat_dict, NONE_SENTINEL, value_allowed_none_or_none_sentinel # noqa: F401 +from oci.decorators import init_model_state_from_kwargs + + +@init_model_state_from_kwargs +class PlanRollbackJobOperationDetailsSummary(JobOperationDetailsSummary): + """ + Job details that are specific to a plan rollback job. For more information about plan rollback jobs, + see `Creating a Plan Rollback Job`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job-plan-rollback.htm + """ + + def __init__(self, **kwargs): + """ + Initializes a new PlanRollbackJobOperationDetailsSummary object with values from keyword arguments. The default value of the :py:attr:`~oci.resource_manager.models.PlanRollbackJobOperationDetailsSummary.operation` attribute + of this class is ``PLAN_ROLLBACK`` and it should not be changed. + The following keyword arguments are supported (corresponding to the getters/setters of this class): + + :param operation: + The value to assign to the operation property of this PlanRollbackJobOperationDetailsSummary. + :type operation: str + + :param target_rollback_job_id: + The value to assign to the target_rollback_job_id property of this PlanRollbackJobOperationDetailsSummary. + :type target_rollback_job_id: str + + """ + self.swagger_types = { + 'operation': 'str', + 'target_rollback_job_id': 'str' + } + + self.attribute_map = { + 'operation': 'operation', + 'target_rollback_job_id': 'targetRollbackJobId' + } + + self._operation = None + self._target_rollback_job_id = None + self._operation = 'PLAN_ROLLBACK' + + @property + def target_rollback_job_id(self): + """ + **[Required]** Gets the target_rollback_job_id of this PlanRollbackJobOperationDetailsSummary. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :return: The target_rollback_job_id of this PlanRollbackJobOperationDetailsSummary. + :rtype: str + """ + return self._target_rollback_job_id + + @target_rollback_job_id.setter + def target_rollback_job_id(self, target_rollback_job_id): + """ + Sets the target_rollback_job_id of this PlanRollbackJobOperationDetailsSummary. + The `OCID`__ of a successful apply job to use for the plan rollback job. + + __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm + + + :param target_rollback_job_id: The target_rollback_job_id of this PlanRollbackJobOperationDetailsSummary. + :type: str + """ + self._target_rollback_job_id = target_rollback_job_id + + def __repr__(self): + return formatted_flat_dict(self) + + def __eq__(self, other): + if other is None: + return False + + return self.__dict__ == other.__dict__ + + def __ne__(self, other): + return not self == other diff --git a/src/oci/resource_manager/models/private_server_config_details.py b/src/oci/resource_manager/models/private_server_config_details.py index 1ec9c4cd02..db8ff7db6f 100644 --- a/src/oci/resource_manager/models/private_server_config_details.py +++ b/src/oci/resource_manager/models/private_server_config_details.py @@ -71,7 +71,7 @@ def private_endpoint_id(self, private_endpoint_id): @property def certificate_id(self): """ - Gets the certificate_id of this PrivateServerConfigDetails. + **[Required]** Gets the certificate_id of this PrivateServerConfigDetails. The `OCID`__ of a certificate associated with the configuration source provider. __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm diff --git a/src/oci/resource_manager/models/resource_discovery_service_summary.py b/src/oci/resource_manager/models/resource_discovery_service_summary.py index 96f86bfe40..5863b51a81 100644 --- a/src/oci/resource_manager/models/resource_discovery_service_summary.py +++ b/src/oci/resource_manager/models/resource_discovery_service_summary.py @@ -10,7 +10,9 @@ @init_model_state_from_kwargs class ResourceDiscoveryServiceSummary(object): """ - A service supported for use with Resource Discovery. + A service supported for use with `Resource Discovery`__. + + __ https://www.terraform.io/docs/providers/oci/guides/resource_discovery.html#services """ #: A constant which can be used with the discovery_scope property of a ResourceDiscoveryServiceSummary. diff --git a/src/oci/resource_manager/models/stack.py b/src/oci/resource_manager/models/stack.py index 686e1738e8..92d7454d3e 100644 --- a/src/oci/resource_manager/models/stack.py +++ b/src/oci/resource_manager/models/stack.py @@ -10,8 +10,15 @@ @init_model_state_from_kwargs class Stack(object): """ - The stack object. Stacks represent definitions of groups of Oracle Cloud Infrastructure - resources that you can act upon as a group. You take action on stacks by using jobs. + The properties that define a stack. + A stack is the collection of Oracle Cloud Infrastructure resources corresponding to a given Terraform configuration. + For instructions on managing stacks, see + `Managing Stacks`__. + For more information about stacks, see + `Key Concepts`__. + + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/stacks.htm + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resourcemanager.htm#concepts__stackdefinition """ #: A constant which can be used with the lifecycle_state property of a Stack. diff --git a/src/oci/resource_manager/models/stack_summary.py b/src/oci/resource_manager/models/stack_summary.py index f3615a0c9f..d8de138c88 100644 --- a/src/oci/resource_manager/models/stack_summary.py +++ b/src/oci/resource_manager/models/stack_summary.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class StackSummary(object): """ - Returns a list of properties and the defining property values for the specified stack. + Summary information for a stack. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/template_category_summary.py b/src/oci/resource_manager/models/template_category_summary.py index c71dbb1599..7fe80dc476 100644 --- a/src/oci/resource_manager/models/template_category_summary.py +++ b/src/oci/resource_manager/models/template_category_summary.py @@ -45,7 +45,10 @@ def id(self): """ Gets the id of this TemplateCategorySummary. Unique identifier for the template category. - Possible values are `0` (Quick Starts), `1` (Service), `2` (Architecture), and `3` (Private). + Possible values are `0` (Quickstarts), `1` (Service), `2` (Architecture), and `3` (Private). + Template category labels are displayed in the Console page listing templates. + Quickstarts, Service, and Architecture templates (categories 0, 1, and 2) are available in all compartments. + Each private template (category 3) is available in the compartment where it was created. :return: The id of this TemplateCategorySummary. @@ -58,7 +61,10 @@ def id(self, id): """ Sets the id of this TemplateCategorySummary. Unique identifier for the template category. - Possible values are `0` (Quick Starts), `1` (Service), `2` (Architecture), and `3` (Private). + Possible values are `0` (Quickstarts), `1` (Service), `2` (Architecture), and `3` (Private). + Template category labels are displayed in the Console page listing templates. + Quickstarts, Service, and Architecture templates (categories 0, 1, and 2) are available in all compartments. + Each private template (category 3) is available in the compartment where it was created. :param id: The id of this TemplateCategorySummary. diff --git a/src/oci/resource_manager/models/template_zip_upload_config_source.py b/src/oci/resource_manager/models/template_zip_upload_config_source.py index 81b2fd383d..13a6f47122 100644 --- a/src/oci/resource_manager/models/template_zip_upload_config_source.py +++ b/src/oci/resource_manager/models/template_zip_upload_config_source.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class TemplateZipUploadConfigSource(TemplateConfigSource): """ - Metadata about the user-provided Terraform configuration. + Metadata about the zip file containing the Terraform configuration for the template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_config_source_details.py b/src/oci/resource_manager/models/update_config_source_details.py index 994ac69f39..a924c7c024 100644 --- a/src/oci/resource_manager/models/update_config_source_details.py +++ b/src/oci/resource_manager/models/update_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateConfigSourceDetails(object): """ - Updates the property details for the configuration source. + Update details for a configuration source. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_configuration_source_provider_details.py b/src/oci/resource_manager/models/update_configuration_source_provider_details.py index 0fb65d859e..3bad133b45 100644 --- a/src/oci/resource_manager/models/update_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/update_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateConfigurationSourceProviderDetails(object): """ - The details for updating a configuration source provider. + Update details for a configuration source provider. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_git_config_source_details.py b/src/oci/resource_manager/models/update_git_config_source_details.py index 72c570d9da..29965dec95 100644 --- a/src/oci/resource_manager/models/update_git_config_source_details.py +++ b/src/oci/resource_manager/models/update_git_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateGitConfigSourceDetails(UpdateConfigSourceDetails): """ - Updates property details for the configuration git information. + Update details for a Git configuration source. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_github_access_token_configuration_source_provider_details.py b/src/oci/resource_manager/models/update_github_access_token_configuration_source_provider_details.py index 5f14eedf26..0642fcdec5 100644 --- a/src/oci/resource_manager/models/update_github_access_token_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/update_github_access_token_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateGithubAccessTokenConfigurationSourceProviderDetails(UpdateConfigurationSourceProviderDetails): """ - The details for updating a configuration source provider of the type `GITHUB_ACCESS_TOKEN`. + Update details for a configuration source provider of the type `GITHUB_ACCESS_TOKEN`. This type corresponds to a configuration source provider in GitHub that is authenticated with a personal access token. """ diff --git a/src/oci/resource_manager/models/update_gitlab_access_token_configuration_source_provider_details.py b/src/oci/resource_manager/models/update_gitlab_access_token_configuration_source_provider_details.py index ca3be642c6..e548f6700d 100644 --- a/src/oci/resource_manager/models/update_gitlab_access_token_configuration_source_provider_details.py +++ b/src/oci/resource_manager/models/update_gitlab_access_token_configuration_source_provider_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateGitlabAccessTokenConfigurationSourceProviderDetails(UpdateConfigurationSourceProviderDetails): """ - The details for updating a configuration source provider of the type `GITLAB_ACCESS_TOKEN`. + Update details for configuration source provider of the type `GITLAB_ACCESS_TOKEN`. This type corresponds to a configuration source provider in GitLab that is authenticated with a personal access token. """ diff --git a/src/oci/resource_manager/models/update_job_details.py b/src/oci/resource_manager/models/update_job_details.py index f53c33de2a..b889f80ff9 100644 --- a/src/oci/resource_manager/models/update_job_details.py +++ b/src/oci/resource_manager/models/update_job_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateJobDetails(object): """ - Updates the display name, free-form tags, and/or defined tag properties of the job. + Update details for a job. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_object_storage_config_source_details.py b/src/oci/resource_manager/models/update_object_storage_config_source_details.py index 6ba43b0d7b..1027a9eb02 100644 --- a/src/oci/resource_manager/models/update_object_storage_config_source_details.py +++ b/src/oci/resource_manager/models/update_object_storage_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateObjectStorageConfigSourceDetails(UpdateConfigSourceDetails): """ - Updates property details for the Object Storage bucket that contains Terraform configuration files. + Update details for an Object Storage bucket that contains Terraform configuration files. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_stack_details.py b/src/oci/resource_manager/models/update_stack_details.py index 2fa41b428f..3cc14767c5 100644 --- a/src/oci/resource_manager/models/update_stack_details.py +++ b/src/oci/resource_manager/models/update_stack_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateStackDetails(object): """ - Specifies which fields and the data for each to update on the specified stack. + Update details for a stack. """ def __init__(self, **kwargs): @@ -184,8 +184,7 @@ def is_third_party_provider_experience_enabled(self): When `true`, changes the stack's sourcing of third-party Terraform providers to `Terraform Registry`__ and allows :func:`custom_terraform_provider`. - Applies to older stacks that use Terraform version 0.12.x and 0.13.x only. - (Older stacks that use other Terraform versions are automatically updated.) + Applies to older stacks. Once set to `true`, cannot be reverted. For more information about stack sourcing of third-party Terraform providers, see `Third-party Provider Configuration`__. @@ -206,8 +205,7 @@ def is_third_party_provider_experience_enabled(self, is_third_party_provider_exp When `true`, changes the stack's sourcing of third-party Terraform providers to `Terraform Registry`__ and allows :func:`custom_terraform_provider`. - Applies to older stacks that use Terraform version 0.12.x and 0.13.x only. - (Older stacks that use other Terraform versions are automatically updated.) + Applies to older stacks. Once set to `true`, cannot be reverted. For more information about stack sourcing of third-party Terraform providers, see `Third-party Provider Configuration`__. diff --git a/src/oci/resource_manager/models/update_template_config_source_details.py b/src/oci/resource_manager/models/update_template_config_source_details.py index 16d5c934f2..00bdf5bd2e 100644 --- a/src/oci/resource_manager/models/update_template_config_source_details.py +++ b/src/oci/resource_manager/models/update_template_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateTemplateConfigSourceDetails(object): """ - Updates the property details for the configuration source for the template. + Update details for a configuration source for a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_template_details.py b/src/oci/resource_manager/models/update_template_details.py index 5841729d3e..c77734ccad 100644 --- a/src/oci/resource_manager/models/update_template_details.py +++ b/src/oci/resource_manager/models/update_template_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateTemplateDetails(object): """ - Updates the specified template. + Update details for a template. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_template_zip_upload_config_source_details.py b/src/oci/resource_manager/models/update_template_zip_upload_config_source_details.py index d7f9de2870..c04348e916 100644 --- a/src/oci/resource_manager/models/update_template_zip_upload_config_source_details.py +++ b/src/oci/resource_manager/models/update_template_zip_upload_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateTemplateZipUploadConfigSourceDetails(UpdateTemplateConfigSourceDetails): """ - Updates property details for the configuration .zip file. + Update details for a configuration zip file. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/update_zip_upload_config_source_details.py b/src/oci/resource_manager/models/update_zip_upload_config_source_details.py index c2a6b823c2..a2f52adab4 100644 --- a/src/oci/resource_manager/models/update_zip_upload_config_source_details.py +++ b/src/oci/resource_manager/models/update_zip_upload_config_source_details.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class UpdateZipUploadConfigSourceDetails(UpdateConfigSourceDetails): """ - Updates property details for the configuration .zip file. + Update details for a Terraform configuration zip file. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/zip_upload_config_source.py b/src/oci/resource_manager/models/zip_upload_config_source.py index 52208a5695..61e274a9d3 100644 --- a/src/oci/resource_manager/models/zip_upload_config_source.py +++ b/src/oci/resource_manager/models/zip_upload_config_source.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ZipUploadConfigSource(ConfigSource): """ - Metadata about the user-provided Terraform configuration. + Metadata about the zip file containing the Terraform configuration. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/models/zip_upload_config_source_record.py b/src/oci/resource_manager/models/zip_upload_config_source_record.py index a0332b4dc7..3589ec6a74 100644 --- a/src/oci/resource_manager/models/zip_upload_config_source_record.py +++ b/src/oci/resource_manager/models/zip_upload_config_source_record.py @@ -10,7 +10,7 @@ @init_model_state_from_kwargs class ZipUploadConfigSourceRecord(ConfigSourceRecord): """ - Information about the user-provided file used for the Terraform configuration. + Information about the user-provided Terraform configuration zip file. """ def __init__(self, **kwargs): diff --git a/src/oci/resource_manager/resource_manager_client.py b/src/oci/resource_manager/resource_manager_client.py index af385c01d3..18a298c3d5 100644 --- a/src/oci/resource_manager/resource_manager_client.py +++ b/src/oci/resource_manager/resource_manager_client.py @@ -471,7 +471,11 @@ def change_private_endpoint_compartment(self, private_endpoint_id, change_privat def change_stack_compartment(self, stack_id, change_stack_compartment_details, **kwargs): """ - Moves a Stack and it's associated Jobs into a different compartment. + Moves a stack (and its associated jobs) into a different compartment within the same tenancy. + For information about moving resources between compartments, see + `Moving Resources to a Different Compartment`__. + + __ https://docs.cloud.oracle.com/iaas/Content/Identity/Tasks/managingcompartments.htm#moveRes :param str stack_id: (required) @@ -1001,12 +1005,12 @@ def create_stack(self, create_stack_details, **kwargs): Creates a stack in the specified compartment. You can create a stack from a Terraform configuration. The Terraform configuration can be directly uploaded or referenced from a source code control system. - You can also create a stack from an existing compartment. + You can also create a stack from an existing compartment, which generates a Terraform configuration. You can also upload the Terraform configuration from an Object Storage bucket. For more information, see - `To create a stack`__. + `Creating Stacks`__. - __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/managingstacksandjobs.htm#createstack-all + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-stack.htm :param oci.resource_manager.models.CreateStackDetails create_stack_details: (required) @@ -1400,7 +1404,7 @@ def delete_private_endpoint(self, private_endpoint_id, **kwargs): def delete_stack(self, stack_id, **kwargs): """ - Deletes the specified stack object. + Deletes the specified stack. :param str stack_id: (required) @@ -1819,7 +1823,7 @@ def get_configuration_source_provider(self, configuration_source_provider_id, ** def get_job(self, job_id, **kwargs): """ - Returns the specified job along with the job details. + Gets the properties of the specified job. :param str job_id: (required) @@ -2181,7 +2185,8 @@ def get_job_logs(self, job_id, **kwargs): def get_job_logs_content(self, job_id, **kwargs): """ - Returns a raw log file for the specified job. The raw log file contains console log entries in text format. The maximum number of entries in a file is 100,000. + Returns the raw log file for the specified job in text format. + The file includes a maximum of 100,000 log entries. :param str job_id: (required) @@ -2278,8 +2283,8 @@ def get_job_logs_content(self, job_id, **kwargs): def get_job_tf_config(self, job_id, **kwargs): """ - Returns the Terraform configuration file for the specified job in .zip format. - Returns an error if no zip file is found. + Returns the Terraform configuration for the specified job in zip format. + If no zip file is found, returns an error. :param str job_id: (required) @@ -2378,9 +2383,9 @@ def get_job_tf_plan(self, job_id, **kwargs): """ Returns the output of the specified Terraform plan job in binary or JSON format. For information about running Terraform plan jobs, see - `To run a plan job`__. + `Creating Plan Jobs`__. - __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/managingstacksandjobs.htm#PlanJobRun + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/create-job.htm :param str job_id: (required) @@ -2809,7 +2814,7 @@ def get_reachable_ip(self, private_ip, private_endpoint_id, **kwargs): def get_stack(self, stack_id, **kwargs): """ - Gets a stack using the stack ID. + Gets the specified stack. :param str stack_id: (required) @@ -2906,7 +2911,7 @@ def get_stack(self, stack_id, **kwargs): def get_stack_tf_config(self, stack_id, **kwargs): """ - Returns the Terraform configuration file in .zip format for the specified stack. + Returns the Terraform configuration file for the specified stack in zip format. Returns an error if no zip file is found. @@ -3296,7 +3301,7 @@ def get_template_logo(self, template_id, **kwargs): def get_template_tf_config(self, template_id, **kwargs): """ - Returns the Terraform configuration file in .zip format for the specified template. + Returns the Terraform configuration file in zip format for the specified template. Returns an error if no zip file is found. @@ -3394,7 +3399,7 @@ def get_template_tf_config(self, template_id, **kwargs): def get_work_request(self, work_request_id, **kwargs): """ - Return the given work request. + Returns the specified work request. :param str work_request_id: (required) @@ -3652,11 +3657,11 @@ def list_configuration_source_providers(self, **kwargs): def list_jobs(self, **kwargs): """ - Returns a list of jobs in a stack or compartment, ordered by time created. + Lists jobs according to the specified filter. By default, the list is ordered by time created. - To list all jobs in a stack, provide the stack `OCID`__. - To list all jobs in a compartment, provide the compartment `OCID`__. - - To return a specific job, provide the job `OCID`__. + - To return a specific job, provide the job `OCID`__. (Equivalent to :func:`get_stack`.) __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm @@ -4007,8 +4012,10 @@ def list_private_endpoints(self, **kwargs): def list_resource_discovery_services(self, **kwargs): """ - Returns a list of supported services for Resource Discovery. For reference on service names, see the `Terraform provider documentation`__. + Returns a list of supported services for `Resource Discovery`__. + For reference on service names, see the `Terraform provider documentation`__. + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resource-discovery.htm __ https://www.terraform.io/docs/providers/oci/guides/resource_discovery.html#services @@ -4242,9 +4249,9 @@ def list_stack_resource_drift_details(self, stack_id, **kwargs): def list_stacks(self, **kwargs): """ - Returns a list of stacks. + Lists stacks according to the specified filter. - If called using the compartment ID, returns all stacks in the specified compartment. - - If called using the stack ID, returns the specified stack. + - If called using the stack ID, returns the specified stack. (See also :func:`get_stack`.) :param str opc_request_id: (optional) @@ -4518,8 +4525,11 @@ def list_templates(self, **kwargs): __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param str template_category_id: (optional) - Unique identifier of the template category. - Possible values are `0` (Quick Starts), `1` (Service), `2` (Architecture), and `3` (Private). + Unique identifier for the template category. + Possible values are `0` (Quickstarts), `1` (Service), `2` (Architecture), and `3` (Private). + Template category labels are displayed in the Console page listing templates. + Quickstarts, Service, and Architecture templates (categories 0, 1, and 2) are available in all compartments. + Each private template (category 3) is available in the compartment where it was created. :param str template_id: (optional) The `OCID`__ of the template. @@ -4758,7 +4768,7 @@ def list_terraform_versions(self, **kwargs): def list_work_request_errors(self, work_request_id, **kwargs): """ - Return a (paginated) list of errors for a given work request. + Returns a paginated list of errors for the specified work request. :param str work_request_id: (required) @@ -4898,7 +4908,7 @@ def list_work_request_errors(self, work_request_id, **kwargs): def list_work_request_logs(self, work_request_id, **kwargs): """ - Return a (paginated) list of logs for a given work request. + Returns a paginated list of logs for the specified work request. :param str work_request_id: (required) @@ -5038,7 +5048,7 @@ def list_work_request_logs(self, work_request_id, **kwargs): def list_work_requests(self, compartment_id, **kwargs): """ - Lists the work requests in a given compartment or for a given resource. + Lists the work requests in the specified compartment or for the specified resource. :param str compartment_id: (required) @@ -5484,15 +5494,13 @@ def update_private_endpoint(self, private_endpoint_id, update_private_endpoint_d def update_stack(self, stack_id, update_stack_details, **kwargs): """ - Updates the specified stack object. + Updates the specified stack. Use `UpdateStack` when you update your Terraform configuration and want your changes to be reflected in the execution plan. For more information, see - `To update a stack`__ and - `To edit a stack`__. + `Updating Stacks`__. - __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/managingstacksandjobs.htm#UpdateStack - __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/managingstacksandjobs.htm#EditStack + __ https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Tasks/update-stack.htm :param str stack_id: (required) @@ -5501,7 +5509,7 @@ def update_stack(self, stack_id, update_stack_details, **kwargs): __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.resource_manager.models.UpdateStackDetails update_stack_details: (required) - Updated information provided for the stack. + The details for updating a stack. :param str opc_request_id: (optional) Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a diff --git a/src/oci/resource_manager/resource_manager_client_composite_operations.py b/src/oci/resource_manager/resource_manager_client_composite_operations.py index 799ec0ad8c..94220333d5 100644 --- a/src/oci/resource_manager/resource_manager_client_composite_operations.py +++ b/src/oci/resource_manager/resource_manager_client_composite_operations.py @@ -741,7 +741,7 @@ def update_stack_and_wait_for_state(self, stack_id, update_stack_details, wait_f __ https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm :param oci.resource_manager.models.UpdateStackDetails update_stack_details: (required) - Updated information provided for the stack. + The details for updating a stack. :param list[str] wait_for_states: An array of states to wait on. These should be valid values for :py:attr:`~oci.resource_manager.models.Stack.lifecycle_state` diff --git a/src/oci/version.py b/src/oci/version.py index 571c9b0bd0..f979ce40fb 100644 --- a/src/oci/version.py +++ b/src/oci/version.py @@ -2,4 +2,4 @@ # Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -__version__ = "2.87.0" +__version__ = "2.88.0"