* Note, config files MUST contain a "DEFAULT" profile, else validation * will fail. Additional profiles are optional. */ +@lombok.extern.slf4j.Slf4j public final class ConfigFileReader { /** * Default location of the config file. */ - public static final String DEFAULT_FILE_PATH = "~/.oraclebmc/config"; + public static final String DEFAULT_FILE_PATH = "~/.oci/config"; + + /** + * The fallback default location of the config file. If and only if the {@link #DEFAULT_FILE_PATH} does not exist, + * this fallback default location will be used. + */ + public static final String FALLBACK_DEFAULT_FILE_PATH = "~/.oraclebmc/config"; + private static final String DEFAULT_PROFILE_NAME = "DEFAULT"; /** @@ -56,7 +64,27 @@ public static ConfigFile parseDefault() throws IOException { * if the file could not be read. */ public static ConfigFile parseDefault(@Nullable String profile) throws IOException { - return parse(DEFAULT_FILE_PATH, profile); + File effectiveFile = null; + + File defaultFile = new File(expandUserHome(DEFAULT_FILE_PATH)); + File fallbackDefaultFile = new File(expandUserHome(FALLBACK_DEFAULT_FILE_PATH)); + + if (defaultFile.exists() && defaultFile.isFile()) { + effectiveFile = defaultFile; + } else if (fallbackDefaultFile.exists() && fallbackDefaultFile.isFile()) { + effectiveFile = fallbackDefaultFile; + } + + if (effectiveFile != null) { + LOG.debug("Loading config file from: {}", effectiveFile); + return parse(effectiveFile.getAbsolutePath(), profile); + } else { + throw new IOException( + String.format( + "Can't load the default config from '%s' or '%s' because it does not exist or it is not a file.", + defaultFile.getAbsolutePath(), + fallbackDefaultFile.getAbsolutePath())); + } } /** @@ -149,7 +177,7 @@ public static ConfigFile parse( private ConfigFileReader() {} /** - * ConfigFile represents a simple lookup mechanism for a BMC config file. + * ConfigFile represents a simple lookup mechanism for a OCI config file. */ @RequiredArgsConstructor(access = AccessLevel.PRIVATE) public static final class ConfigFile { diff --git a/bmc-common/src/main/java/com/oracle/bmc/OCID.java b/bmc-common/src/main/java/com/oracle/bmc/OCID.java index e454304bdee..4498ff97658 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/OCID.java +++ b/bmc-common/src/main/java/com/oracle/bmc/OCID.java @@ -6,7 +6,7 @@ import java.util.regex.Pattern; /** - * Oracle Bare Metal Cloud Services unique ID. + * Oracle Cloud Infrastructure unique ID. *
* See documentation. */ diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java index ebb9c47cdca..9eb017fb024 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/BasicAuthenticationDetailsProvider.java @@ -6,7 +6,7 @@ import java.io.InputStream; /** - * Base interface used provide required information to sign requests to Oracle Bare Metal Services. + * Base interface used provide required information to sign requests to Oracle Cloud Infrastructure. *
* Implementations may choose to provide hints about the cacheability of the keyId and privateKey using * {@link AuthCachingPolicy} (optional). diff --git a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java index 096d56aee5d..642aa835957 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java +++ b/bmc-common/src/main/java/com/oracle/bmc/auth/ConfigFileAuthenticationDetailsProvider.java @@ -15,7 +15,7 @@ /** * Implementation of {@link AuthenticationDetailsProvider} that uses a standard - * BMC configuration file as an input. + * OCI configuration file as an input. */ @ToString public class ConfigFileAuthenticationDetailsProvider implements AuthenticationDetailsProvider { @@ -39,7 +39,7 @@ public ConfigFileAuthenticationDetailsProvider(String profile) throws IOExceptio * Creates a new instance. * * @param configurationFilePath - * path to the BMC configuration file + * path to the OCI configuration file * @param profile * profile to load, optional * @throws IOException diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java index 182553b8854..ae8a6d40181 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/DefaultConfigurator.java @@ -53,7 +53,7 @@ static void setAllowRestrictedHeadersProperty(String previousValue) { + " was explicitly " + "set to " + previousValue - + "; the Oracle BMC SDK needs to set this property to true. Failing..."); + + "; the OCI SDK needs to set this property to true. Failing..."); } System.setProperty(SUN_NET_HTTP_ALLOW_RESTRICTED_HEADERS, "true"); } diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java index 488b491008b..4e6c7ca13e5 100644 --- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java +++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/DefaultRequestSigner.java @@ -11,12 +11,12 @@ import lombok.NoArgsConstructor; /** - * Class that exposes a way to create a {@link RequestSigner} for use with BMC. + * Class that exposes a way to create a {@link RequestSigner} for use with OCI. * The returned signers implement signing strategies outlined by the * signing guidelines. *
- * This is only exposed so clients can write REST calls directly against BMCS
+ * This is only exposed so clients can write REST calls directly against OCI
* without using the SDK provided clients, but this class may change without
* notice -- users are encouraged to use the SDK provided clients.
*/
diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java
index e95d661d5d7..157aafbcb12 100644
--- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java
+++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/SigningStrategy.java
@@ -13,7 +13,7 @@
import lombok.RequiredArgsConstructor;
/**
- * Enum for the various signing strategies used by BMC.
+ * Enum for the various signing strategies used by OCI.
*/
@InternalSdk
@RequiredArgsConstructor
diff --git a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java
index b68abfdc470..459701e8208 100644
--- a/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java
+++ b/bmc-common/src/main/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplier.java
@@ -94,8 +94,7 @@ public PEMFileRSAPrivateKeySupplier(
throw new IllegalArgumentException(
"Private key must be in PEM format, was: " + object.getClass());
} else {
- throw new IllegalArgumentException(
- "Private key must be in PEM format");
+ throw new IllegalArgumentException("Private key must be in PEM format");
}
this.key = (RSAPrivateKey) converter.getPrivateKey(keyInfo);
diff --git a/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java b/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java
index 32de58a4eec..fa8c1aec0b9 100644
--- a/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java
+++ b/bmc-common/src/main/java/com/oracle/bmc/util/JavaRuntimeUtils.java
@@ -61,7 +61,7 @@ static JreVersion parse() {
// http://www.oracle.com/technetwork/java/javase/versioning-naming-139433.html
String[] versionParts = versionString.split("\\.");
int featureVersion = Integer.parseInt(versionParts[1]);
- // BMC requires TLS1.2, which is only supported on Java7+.
+ // OCI requires TLS1.2, which is only supported on Java7+.
if (featureVersion < 7) {
version = JreVersion.Unsupported;
} else if (featureVersion == 7) {
diff --git a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java
index 1aa68655df7..03a94052a34 100644
--- a/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java
+++ b/bmc-common/src/main/java/com/oracle/bmc/waiter/Waiters.java
@@ -21,7 +21,7 @@ public class Waiters {
new MaxTimeTerminationStrategy(secondsToMillis(1200));
/**
- * The default BMC polling waiter that will be used. Configured using
+ * The default OCI polling waiter that will be used. Configured using
* {@link #DEFAULT_POLLING_TERMINATION_STRATEGY} and
* {@link #DEFAULT_POLLING_DELAY_STRATEGY}.
*/
diff --git a/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java b/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java
index 0991d5ca8ba..c15e1c0bc49 100644
--- a/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java
+++ b/bmc-common/src/test/java/com/oracle/bmc/ConfigFileReaderTest.java
@@ -8,12 +8,19 @@
import java.io.FileNotFoundException;
import java.io.IOException;
+import org.junit.Ignore;
import org.junit.Test;
import com.oracle.bmc.ConfigFileReader.ConfigFile;
public class ConfigFileReaderTest {
+ @Test
+ @Ignore
+ public void defaultConfigFile() throws IOException {
+ ConfigFileReader.parseDefault();
+ }
+
@Test(expected = FileNotFoundException.class)
public void noConfigFile() throws IOException {
ConfigFileReader.parse("src/test/resources/does_not_exist");
diff --git a/bmc-common/src/test/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplierTest.java b/bmc-common/src/test/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplierTest.java
index c5ad79e5158..79c4b835ac1 100644
--- a/bmc-common/src/test/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplierTest.java
+++ b/bmc-common/src/test/java/com/oracle/bmc/http/signing/internal/PEMFileRSAPrivateKeySupplierTest.java
@@ -1,3 +1,6 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
package com.oracle.bmc.http.signing.internal;
import org.junit.Test;
@@ -14,7 +17,7 @@
* Tests for {@link PEMFileRSAPrivateKeySupplierTest}.
*/
public class PEMFileRSAPrivateKeySupplierTest {
- @Test(expected=IllegalArgumentException.class)
+ @Test(expected = IllegalArgumentException.class)
public void ctor_invalidFile() throws IOException {
InputStream notAPem = new ByteArrayInputStream(new byte[0]);
// not a valid key file
diff --git a/bmc-core/pom.xml b/bmc-core/pom.xml
index 5e61249b9f3..fc00ac41de9 100644
--- a/bmc-core/pom.xml
+++ b/bmc-core/pom.xml
@@ -3,22 +3,22 @@
- * This is an asynchronous operation; the attachment's `lifecycleState` will change to DETACHING temporarily
+ * This is an asynchronous operation. The attachment's `lifecycleState` will change to DETACHING temporarily
* until the attachment is completely removed.
*
* @param request The request object containing the details to send
@@ -209,6 +227,15 @@ GetConsoleHistoryContentResponse getConsoleHistoryContent(
*/
GetInstanceResponse getInstance(GetInstanceRequest request);
+ /**
+ * Get the details of an instance console connection
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ GetInstanceConsoleConnectionResponse getInstanceConsoleConnection(
+ GetInstanceConsoleConnectionRequest request);
+
/**
* Gets the information for the specified VNIC attachment.
*
@@ -290,7 +317,7 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential
* {@link #getVnic(GetVnicRequest) getVnic} with the VNIC ID.
*
* You can later add secondary VNICs to an instance. For more information, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
@@ -318,6 +345,15 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential
*/
ListImagesResponse listImages(ListImagesRequest request);
+ /**
+ * Lists the console connections for the specified compartment or instance that have not been deleted.
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ ListInstanceConsoleConnectionsResponse listInstanceConsoleConnections(
+ ListInstanceConsoleConnectionsRequest request);
+
/**
* Lists the instances in the specified compartment and the specified Availability Domain.
* You can filter the results by specifying an instance name (the list will include all the identically-named
@@ -366,7 +402,7 @@ GetWindowsInstanceInitialCredentialsResponse getWindowsInstanceInitialCredential
* Terminates the specified instance. Any attached VNICs and volumes are automatically detached
* when the instance terminates.
*
- * This is an asynchronous operation; the instance's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The instance's `lifecycleState` will change to TERMINATING temporarily
* until the instance is completely removed.
*
* @param request The request object containing the details to send
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java
index 125bc68d052..c542cbb11eb 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsync.java
@@ -39,7 +39,7 @@ public interface ComputeAsync extends AutoCloseable {
/**
* Creates a secondary VNIC and attaches it to the specified instance.
* For more information about secondary VNICs, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
*
* @param request The request object containing the details to send
@@ -139,6 +139,24 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the attachment's `lifecycleState` will change to DETACHING temporarily
+ * This is an asynchronous operation. The attachment's `lifecycleState` will change to DETACHING temporarily
* until the attachment is completely removed.
*
*
@@ -296,6 +332,23 @@ java.util.concurrent.Future
* You can later add secondary VNICs to an instance. For more information, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
*
* @param request The request object containing the details to send
@@ -458,6 +511,24 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the instance's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The instance's `lifecycleState` will change to TERMINATING temporarily
* until the instance is completely removed.
*
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java
index bde71d919b8..c09557b2132 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/ComputeAsyncClient.java
@@ -205,6 +205,37 @@ public java.util.concurrent.Future
* For the purposes of access control, you must provide the OCID of the compartment where you want
* the CPE to reside. Notice that the CPE doesn't have to be in the same compartment as the IPSec
@@ -47,8 +47,8 @@ public interface VirtualNetwork extends AutoCloseable {
* compartments and access control, see [Overview of the IAM Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/overview.htm).
* For information about OCIDs, see [Resource Identifiers](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm).
*
- * You must provide the public IP address of your on-premise router. See
- * [Configuring Your On-Premise Router](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
+ * You must provide the public IP address of your on-premises router. See
+ * [Configuring Your On-Premises Router for an IPSec VPN](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
*
* You may optionally specify a *display name* for the CPE, otherwise a default is provided. It does not have to
* be unique, and you can change it. Avoid entering confidential information.
@@ -131,7 +131,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a new Dynamic Routing Gateway (DRG) in the specified compartment. For more information,
- * see [Managing Dynamic Routing Gateways (DRGs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDRGs.htm).
+ * see [Dynamic Routing Gateways (DRGs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDRGs.htm).
*
* For the purposes of access control, you must provide the OCID of the compartment where you want
* the DRG to reside. Notice that the DRG doesn't have to be in the same compartment as the VCN,
@@ -153,7 +153,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Attaches the specified DRG to the specified VCN. A VCN can be attached to only one DRG at a time,
* and vice versa. The response includes a `DrgAttachment` object with its own OCID. For more
* information about DRGs, see
- * [Managing Dynamic Routing Gateways (DRGs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDRGs.htm).
+ * [Dynamic Routing Gateways (DRGs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDRGs.htm).
*
* You may optionally specify a *display name* for the attachment, otherwise a default is provided.
* It does not have to be unique, and you can change it. Avoid entering confidential information.
@@ -170,7 +170,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a new IPSec connection between the specified DRG and CPE. For more information, see
- * [Managing IPSec Connections](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm).
+ * [IPSec VPNs](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm).
*
* In the request, you must include at least one static route to the CPE object (you're allowed a maximum
* of 10). For example: 10.0.8.0/16.
@@ -186,12 +186,12 @@ public interface VirtualNetwork extends AutoCloseable {
* You may optionally specify a *display name* for the IPSec connection, otherwise a default is provided.
* It does not have to be unique, and you can change it. Avoid entering confidential information.
*
- * After creating the IPSec connection, you need to configure your on-premise router
+ * After creating the IPSec connection, you need to configure your on-premises router
* with tunnel-specific information returned by
* {@link #getIPSecConnectionDeviceConfig(GetIPSecConnectionDeviceConfigRequest) getIPSecConnectionDeviceConfig}.
* For each tunnel, that operation gives you the IP address of Oracle's VPN headend and the shared secret
- * (i.e., the pre-shared key). For more information, see
- * [Configuring Your On-Premise Router](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
+ * (that is, the pre-shared key). For more information, see
+ * [Configuring Your On-Premises Router for an IPSec VPN](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
*
* To get the status of the tunnels (whether they're up or down), use
* {@link #getIPSecConnectionDeviceStatus(GetIPSecConnectionDeviceStatusRequest) getIPSecConnectionDeviceStatus}.
@@ -204,7 +204,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a new Internet Gateway for the specified VCN. For more information, see
- * [Managing Internet Gateways](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIGs.htm).
+ * [Connectivity to the Internet](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIGs.htm).
*
* For the purposes of access control, you must provide the OCID of the compartment where you want the Internet
* Gateway to reside. Notice that the Internet Gateway doesn't have to be in the same compartment as the VCN or
@@ -217,7 +217,7 @@ public interface VirtualNetwork extends AutoCloseable {
* does not have to be unique, and you can change it. Avoid entering confidential information.
*
* For traffic to flow between a subnet and an Internet Gateway, you must create a route rule accordingly in
- * the subnet's route table (e.g., 0.0.0.0/0 > Internet Gateway). See
+ * the subnet's route table (for example, 0.0.0.0/0 > Internet Gateway). See
* {@link #updateRouteTable(UpdateRouteTableRequest) updateRouteTable}.
*
* You must specify whether the Internet Gateway is enabled when you create it. If it's disabled, that means no
@@ -234,7 +234,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a secondary private IP for the specified VNIC.
* For more information about secondary private IPs, see
- * [Managing IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
+ * [IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
*
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
@@ -246,7 +246,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Creates a new route table for the specified VCN. In the request you must also include at least one route
* rule for the new route table. For information on the number of rules you can have in a route table, see
* [Service Limits](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/servicelimits.htm). For general information about route
- * tables in your VCN, see [Managing Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
+ * tables in your VCN, see [Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
*
* For the purposes of access control, you must provide the OCID of the compartment where you want the route
* table to reside. Notice that the route table doesn't have to be in the same compartment as the VCN, subnets,
@@ -289,7 +289,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a new subnet in the specified VCN. You can't change the size of the subnet after creation,
* so it's important to think about the size of subnets you need before creating them.
- * For more information, see [Managing Subnets](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingsubnets.htm).
+ * For more information, see [VCNs and Subnets](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVCNs.htm).
* For information on the number of subnets you can have in a VCN, see
* [Service Limits](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/servicelimits.htm).
*
@@ -302,7 +302,7 @@ public interface VirtualNetwork extends AutoCloseable {
*
* You may optionally associate a route table with the subnet. If you don't, the subnet will use the
* VCN's default route table. For more information about route tables, see
- * [Managing Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
+ * [Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
*
* You may optionally associate a security list with the subnet. If you don't, the subnet will use the
* VCN's default security list. For more information about security lists, see
@@ -310,7 +310,7 @@ public interface VirtualNetwork extends AutoCloseable {
*
* You may optionally associate a set of DHCP options with the subnet. If you don't, the subnet will use the
* VCN's default set. For more information about DHCP options, see
- * [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
+ * [DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
*
* You may optionally specify a *display name* for the subnet, otherwise a default is provided.
* It does not have to be unique, and you can change it. Avoid entering confidential information.
@@ -327,12 +327,12 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Creates a new Virtual Cloud Network (VCN). For more information, see
- * [Managing Virtual Cloud Networks (VCNs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVCNs.htm).
+ * [VCNs and Subnets](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVCNs.htm).
*
* For the VCN you must specify a single, contiguous IPv4 CIDR block. Oracle recommends using one of the
* private IP address ranges specified in [RFC 1918](https://tools.ietf.org/html/rfc1918) (10.0.0.0/8,
* 172.16/12, and 192.168/16). Example: 172.16.0.0/16. The CIDR block can range from /16 to /30, and it
- * must not overlap with your on-premise network. You can't change the size of the VCN after creation.
+ * must not overlap with your on-premises network. You can't change the size of the VCN after creation.
*
* For the purposes of access control, you must provide the OCID of the compartment where you want the VCN to
* reside. Consult an Oracle Bare Metal Cloud Services administrator in your organization if you're not sure which
@@ -350,7 +350,7 @@ public interface VirtualNetwork extends AutoCloseable {
*
* The VCN automatically comes with a default route table, default security list, and default set of DHCP options.
* The OCID for each is returned in the response. You can't delete these default objects, but you can change their
- * contents (i.e., route rules, etc.)
+ * contents (that is, change the route rules, security list rules, and so on).
*
* The VCN and subnets you create are not accessible until you attach an Internet Gateway or set up an IPSec VPN
* or FastConnect. For more information, see
@@ -383,7 +383,7 @@ public interface VirtualNetwork extends AutoCloseable {
* the traffic to flow through. Make sure you attach the DRG to your
* VCN and confirm the VCN's routing sends traffic to the DRG. Otherwise
* traffic will not flow. For more information, see
- * [Managing Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
+ * [Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
*
* @param request The request object containing the details to send
* @return A response object containing details about the completed operation
@@ -393,7 +393,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Deletes the specified CPE object. The CPE must not be connected to a DRG. This is an asynchronous
- * operation; the CPE's `lifecycleState` will change to TERMINATING temporarily until the CPE is completely
+ * operation. The CPE's `lifecycleState` will change to TERMINATING temporarily until the CPE is completely
* removed.
*
* @param request The request object containing the details to send
@@ -427,7 +427,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Deletes the specified set of DHCP options, but only if it's not associated with a subnet. You can't delete a
* VCN's default set of DHCP options.
*
- * This is an asynchronous operation; the state of the set of options will switch to TERMINATING temporarily
+ * This is an asynchronous operation. The state of the set of options will switch to TERMINATING temporarily
* until the set is completely removed.
*
* @param request The request object containing the details to send
@@ -439,7 +439,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Deletes the specified DRG. The DRG must not be attached to a VCN or be connected to your on-premise
* network. Also, there must not be a route table that lists the DRG as a target. This is an asynchronous
- * operation; the DRG's `lifecycleState` will change to TERMINATING temporarily until the DRG is completely
+ * operation. The DRG's `lifecycleState` will change to TERMINATING temporarily until the DRG is completely
* removed.
*
* @param request The request object containing the details to send
@@ -450,7 +450,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Detaches a DRG from a VCN by deleting the corresponding `DrgAttachment`. This is an asynchronous
- * operation; the attachment's `lifecycleState` will change to DETACHING temporarily until the attachment
+ * operation. The attachment's `lifecycleState` will change to DETACHING temporarily until the attachment
* is completely removed.
*
* @param request The request object containing the details to send
@@ -461,12 +461,12 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Deletes the specified IPSec connection. If your goal is to disable the IPSec VPN between your VCN and
- * on-premise network, it's easiest to simply detach the DRG but keep all the IPSec VPN components intact.
+ * on-premises network, it's easiest to simply detach the DRG but keep all the IPSec VPN components intact.
* If you were to delete all the components and then later need to create an IPSec VPN again, you would
- * need to configure your on-premise router again with the new information returned from
+ * need to configure your on-premises router again with the new information returned from
* {@link #createIPSecConnection(CreateIPSecConnectionRequest) createIPSecConnection}.
*
- * This is an asynchronous operation; the connection's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The connection's `lifecycleState` will change to TERMINATING temporarily
* until the connection is completely removed.
*
* @param request The request object containing the details to send
@@ -479,7 +479,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Deletes the specified Internet Gateway. The Internet Gateway does not have to be disabled, but
* there must not be a route table that lists it as a target.
*
- * This is an asynchronous operation; the gateway's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The gateway's `lifecycleState` will change to TERMINATING temporarily
* until the gateway is completely removed.
*
* @param request The request object containing the details to send
@@ -506,7 +506,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Deletes the specified route table, but only if it's not associated with a subnet. You can't delete a
* VCN's default route table.
*
- * This is an asynchronous operation; the route table's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The route table's `lifecycleState` will change to TERMINATING temporarily
* until the route table is completely removed.
*
* @param request The request object containing the details to send
@@ -519,7 +519,7 @@ public interface VirtualNetwork extends AutoCloseable {
* Deletes the specified security list, but only if it's not associated with a subnet. You can't delete
* a VCN's default security list.
*
- * This is an asynchronous operation; the security list's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The security list's `lifecycleState` will change to TERMINATING temporarily
* until the security list is completely removed.
*
* @param request The request object containing the details to send
@@ -530,7 +530,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Deletes the specified subnet, but only if there are no instances in the subnet. This is an asynchronous
- * operation; the subnet's `lifecycleState` will change to TERMINATING temporarily. If there are any
+ * operation. The subnet's `lifecycleState` will change to TERMINATING temporarily. If there are any
* instances in the subnet, the state will instead change back to AVAILABLE.
*
* @param request The request object containing the details to send
@@ -541,7 +541,7 @@ public interface VirtualNetwork extends AutoCloseable {
/**
* Deletes the specified VCN. The VCN must be empty and have no attached gateways. This is an asynchronous
- * operation; the VCN's `lifecycleState` will change to TERMINATING temporarily until the VCN is completely
+ * operation. The VCN's `lifecycleState` will change to TERMINATING temporarily until the VCN is completely
* removed.
*
* @param request The request object containing the details to send
@@ -631,7 +631,7 @@ GetCrossConnectLetterOfAuthorityResponse getCrossConnectLetterOfAuthority(
/**
* Gets the specified IPSec connection's basic information, including the static routes for the
- * on-premise router. If you want the status of the connection (whether it's up or down), use
+ * on-premises router. If you want the status of the connection (whether it's up or down), use
* {@link #getIPSecConnectionDeviceStatus(GetIPSecConnectionDeviceStatusRequest) getIPSecConnectionDeviceStatus}.
*
* @param request The request object containing the details to send
@@ -774,7 +774,7 @@ ListCrossConnectLocationsResponse listCrossConnectLocations(
/**
* Lists the available port speeds for cross-connects. You need this information
- * so you can specify your desired port speed (i.e., shape) when you create a
+ * so you can specify your desired port speed (that is, shape) when you create a
* cross-connect.
*
* @param request The request object containing the details to send
@@ -910,7 +910,7 @@ ListFastConnectProviderServicesResponse listFastConnectProviderServices(
/**
* Lists the available bandwidth levels for virtual circuits. You need this
- * information so you can specify your desired bandwidth level (i.e., shape)
+ * information so you can specify your desired bandwidth level (that is, shape)
* when you create a virtual circuit.
*
* For the compartment ID, provide the OCID of your tenancy (the root compartment).
@@ -1088,7 +1088,7 @@ ListVirtualCircuitBandwidthShapesResponse listVirtualCircuitBandwidthShapes(
*
**Important:** If the virtual circuit is working and in the
* PROVISIONED state, updating any of the network-related properties
- * (such as the DRG being used, the BGP ASN, etc.) will cause the virtual
+ * (such as the DRG being used, the BGP ASN, and so on) will cause the virtual
* circuit's state to switch to PROVISIONING and the related BGP
* session to go down. After Oracle re-provisions the virtual circuit,
* its state will return to PROVISIONED. Make sure you confirm that
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java
index 73bf33228cd..579bfcb4f3d 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkAsync.java
@@ -38,7 +38,7 @@ public interface VirtualNetworkAsync extends AutoCloseable {
/**
* Creates a new virtual Customer-Premises Equipment (CPE) object in the specified compartment. For
- * more information, see [Managing IPSec VPNs](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm).
+ * more information, see [IPSec VPNs](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPsec.htm).
*
* For the purposes of access control, you must provide the OCID of the compartment where you want
* the CPE to reside. Notice that the CPE doesn't have to be in the same compartment as the IPSec
@@ -47,8 +47,8 @@ public interface VirtualNetworkAsync extends AutoCloseable {
* compartments and access control, see [Overview of the IAM Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Concepts/overview.htm).
* For information about OCIDs, see [Resource Identifiers](https://docs.us-phoenix-1.oraclecloud.com/Content/General/Concepts/identifiers.htm).
*
- * You must provide the public IP address of your on-premise router. See
- * [Configuring Your On-Premise Router](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
+ * You must provide the public IP address of your on-premises router. See
+ * [Configuring Your On-Premises Router for an IPSec VPN](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
*
* You may optionally specify a *display name* for the CPE, otherwise a default is provided. It does not have to
* be unique, and you can change it. Avoid entering confidential information.
@@ -161,7 +161,7 @@ java.util.concurrent.Future
* For the purposes of access control, you must provide the OCID of the compartment where you want
* the DRG to reside. Notice that the DRG doesn't have to be in the same compartment as the VCN,
@@ -189,7 +189,7 @@ java.util.concurrent.Future
* You may optionally specify a *display name* for the attachment, otherwise a default is provided.
* It does not have to be unique, and you can change it. Avoid entering confidential information.
@@ -214,7 +214,7 @@ java.util.concurrent.Future
* In the request, you must include at least one static route to the CPE object (you're allowed a maximum
* of 10). For example: 10.0.8.0/16.
@@ -230,12 +230,12 @@ java.util.concurrent.Future
- * After creating the IPSec connection, you need to configure your on-premise router
+ * After creating the IPSec connection, you need to configure your on-premises router
* with tunnel-specific information returned by
* {@link #getIPSecConnectionDeviceConfig(GetIPSecConnectionDeviceConfigRequest, Consumer, Consumer) getIPSecConnectionDeviceConfig}.
* For each tunnel, that operation gives you the IP address of Oracle's VPN headend and the shared secret
- * (i.e., the pre-shared key). For more information, see
- * [Configuring Your On-Premise Router](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
+ * (that is, the pre-shared key). For more information, see
+ * [Configuring Your On-Premises Router for an IPSec VPN](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/configuringCPE.htm).
*
* To get the status of the tunnels (whether they're up or down), use
* {@link #getIPSecConnectionDeviceStatus(GetIPSecConnectionDeviceStatusRequest, Consumer, Consumer) getIPSecConnectionDeviceStatus}.
@@ -256,7 +256,7 @@ java.util.concurrent.Future
* For the purposes of access control, you must provide the OCID of the compartment where you want the Internet
* Gateway to reside. Notice that the Internet Gateway doesn't have to be in the same compartment as the VCN or
@@ -269,7 +269,7 @@ java.util.concurrent.Future
* For traffic to flow between a subnet and an Internet Gateway, you must create a route rule accordingly in
- * the subnet's route table (e.g., 0.0.0.0/0 > Internet Gateway). See
+ * the subnet's route table (for example, 0.0.0.0/0 > Internet Gateway). See
* {@link #updateRouteTable(UpdateRouteTableRequest, Consumer, Consumer) updateRouteTable}.
*
* You must specify whether the Internet Gateway is enabled when you create it. If it's disabled, that means no
@@ -294,7 +294,7 @@ java.util.concurrent.Future
* For the purposes of access control, you must provide the OCID of the compartment where you want the route
* table to reside. Notice that the route table doesn't have to be in the same compartment as the VCN, subnets,
@@ -371,7 +371,7 @@ java.util.concurrent.Future
@@ -384,7 +384,7 @@ java.util.concurrent.Future
* You may optionally associate a route table with the subnet. If you don't, the subnet will use the
* VCN's default route table. For more information about route tables, see
- * [Managing Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
+ * [Route Tables](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingroutetables.htm).
*
* You may optionally associate a security list with the subnet. If you don't, the subnet will use the
* VCN's default security list. For more information about security lists, see
@@ -392,7 +392,7 @@ java.util.concurrent.Future
* You may optionally associate a set of DHCP options with the subnet. If you don't, the subnet will use the
* VCN's default set. For more information about DHCP options, see
- * [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
+ * [DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
*
* You may optionally specify a *display name* for the subnet, otherwise a default is provided.
* It does not have to be unique, and you can change it. Avoid entering confidential information.
@@ -416,12 +416,12 @@ java.util.concurrent.Future
* For the VCN you must specify a single, contiguous IPv4 CIDR block. Oracle recommends using one of the
* private IP address ranges specified in [RFC 1918](https://tools.ietf.org/html/rfc1918) (10.0.0.0/8,
* 172.16/12, and 192.168/16). Example: 172.16.0.0/16. The CIDR block can range from /16 to /30, and it
- * must not overlap with your on-premise network. You can't change the size of the VCN after creation.
+ * must not overlap with your on-premises network. You can't change the size of the VCN after creation.
*
* For the purposes of access control, you must provide the OCID of the compartment where you want the VCN to
* reside. Consult an Oracle Bare Metal Cloud Services administrator in your organization if you're not sure which
@@ -439,7 +439,7 @@ java.util.concurrent.Future
* The VCN automatically comes with a default route table, default security list, and default set of DHCP options.
* The OCID for each is returned in the response. You can't delete these default objects, but you can change their
- * contents (i.e., route rules, etc.)
+ * contents (that is, change the route rules, security list rules, and so on).
*
* The VCN and subnets you create are not accessible until you attach an Internet Gateway or set up an IPSec VPN
* or FastConnect. For more information, see
@@ -478,7 +478,7 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the state of the set of options will switch to TERMINATING temporarily
+ * This is an asynchronous operation. The state of the set of options will switch to TERMINATING temporarily
* until the set is completely removed.
*
*
@@ -572,7 +572,7 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the connection's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The connection's `lifecycleState` will change to TERMINATING temporarily
* until the connection is completely removed.
*
*
@@ -634,7 +634,7 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the gateway's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The gateway's `lifecycleState` will change to TERMINATING temporarily
* until the gateway is completely removed.
*
*
@@ -676,7 +676,7 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the route table's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The route table's `lifecycleState` will change to TERMINATING temporarily
* until the route table is completely removed.
*
*
@@ -696,7 +696,7 @@ java.util.concurrent.Future
- * This is an asynchronous operation; the security list's `lifecycleState` will change to TERMINATING temporarily
+ * This is an asynchronous operation. The security list's `lifecycleState` will change to TERMINATING temporarily
* until the security list is completely removed.
*
*
@@ -715,7 +715,7 @@ java.util.concurrent.Future
* For the compartment ID, provide the OCID of your tenancy (the root compartment).
@@ -1663,7 +1663,7 @@ java.util.concurrent.Future
**Important:** If the virtual circuit is working and in the
* PROVISIONED state, updating any of the network-related properties
- * (such as the DRG being used, the BGP ASN, etc.) will cause the virtual
+ * (such as the DRG being used, the BGP ASN, and so on) will cause the virtual
* circuit's state to switch to PROVISIONING and the related BGP
* session to go down. After Oracle re-provisions the virtual circuit,
* its state will return to PROVISIONED. Make sure you confirm that
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java
index 9a69b954cc1..2fc00a6a70d 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/VirtualNetworkClient.java
@@ -84,6 +84,19 @@ public VirtualNetworkClient(
com.oracle.bmc.http.signing.RequestSigner requestSigner =
requestSignerFactory.createRequestSigner(SERVICE, authenticationDetailsProvider);
this.client = restClientFactory.create(requestSigner, configuration);
+ // up to 50 (core) threads, time out after 60s idle, all daemon
+ java.util.concurrent.ThreadPoolExecutor executorService =
+ new java.util.concurrent.ThreadPoolExecutor(
+ 50,
+ 50,
+ 60L,
+ java.util.concurrent.TimeUnit.SECONDS,
+ new java.util.concurrent.LinkedBlockingQueue
@@ -87,7 +87,7 @@ public static Builder builder() {
String id;
/**
- * The public IP address of the on-premise router.
+ * The public IP address of the on-premises router.
**/
@com.fasterxml.jackson.annotation.JsonProperty("ipAddress")
@javax.validation.Valid
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java
index 0b9177eceab..1615cfe2671 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateCpeDetails.java
@@ -56,7 +56,7 @@ public static Builder builder() {
String displayName;
/**
- * The public IP address of the on-premise router.
+ * The public IP address of the on-premises router.
*
* Example: `143.19.23.16`
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java
new file mode 100644
index 00000000000..b1d10ededab
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateInstanceConsoleConnectionDetails.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.model;
+
+/**
+ * Properties used to create an instance console connection. The instance console connection is created
+ * in the same compartment as the instance.
+ *
+ **/
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Value
+@com.fasterxml.jackson.databind.annotation.JsonDeserialize(
+ builder = CreateInstanceConsoleConnectionDetails.Builder.class
+)
+public class CreateInstanceConsoleConnectionDetails {
+ @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
+ @lombok.experimental.Accessors(fluent = true)
+ @lombok.Setter
+ public static class Builder {
+ @com.fasterxml.jackson.annotation.JsonProperty("instanceId")
+ private String instanceId;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("publicKey")
+ private String publicKey;
+
+ public CreateInstanceConsoleConnectionDetails build() {
+ return new CreateInstanceConsoleConnectionDetails(instanceId, publicKey);
+ }
+
+ @com.fasterxml.jackson.annotation.JsonIgnore
+ public Builder copy(CreateInstanceConsoleConnectionDetails o) {
+ return instanceId(o.getInstanceId()).publicKey(o.getPublicKey());
+ }
+ }
+
+ /**
+ * Create a new builder.
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * The host instance OCID
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("instanceId")
+ String instanceId;
+
+ /**
+ * An ssh public key that will be used to authenticate the console connection.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("publicKey")
+ String publicKey;
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java
index 22c1ef1fcf9..ccf8709fc54 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateSubnetDetails.java
@@ -131,7 +131,7 @@ public static Builder builder() {
/**
* A DNS label for the subnet, used in conjunction with the VNIC's hostname and
* VCN's DNS label to form a fully qualified domain name (FQDN) for each VNIC
- * within this subnet (e.g., `bminstance-1.subnet123.vcn1.oraclevcn.com`).
+ * within this subnet (for example, `bminstance-1.subnet123.vcn1.oraclevcn.com`).
* Must be an alphanumeric string that begins with a letter and is unique within the VCN.
* The value cannot be changed.
*
@@ -156,7 +156,7 @@ public static Builder builder() {
* otherwise during instance launch or VNIC creation (with the
* `assignPublicIp` flag in {@link CreateVnicDetails}).
* If `prohibitPublicIpOnVnic` is set to true, VNICs created in this
- * subnet cannot have public IP addresses (i.e., it's a private
+ * subnet cannot have public IP addresses (that is, it's a private
* subnet).
*
* Example: `true`
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java
index dce4a137012..7bc79ff1706 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVcnDetails.java
@@ -74,7 +74,7 @@ public static Builder builder() {
/**
* A DNS label for the VCN, used in conjunction with the VNIC's hostname and
* subnet's DNS label to form a fully qualified domain name (FQDN) for each VNIC
- * within this subnet (e.g., `bminstance-1.subnet123.vcn1.oraclevcn.com`).
+ * within this subnet (for example, `bminstance-1.subnet123.vcn1.oraclevcn.com`).
* Not required to be unique, but it's a best practice to set unique DNS labels
* for VCNs in your tenancy. Must be an alphanumeric string that begins with a letter.
* The value cannot be changed.
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java
index 6ee77a4bd76..ebdd9da90d0 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVirtualCircuitDetails.java
@@ -81,7 +81,7 @@ public static Builder builder() {
/**
* The provisioned data rate of the connection. To get a list of the
- * available bandwidth levels (i.e., shapes), see
+ * available bandwidth levels (that is, shapes), see
* {@link #listVirtualCircuitBandwidthShapes(ListVirtualCircuitBandwidthShapesRequest) listVirtualCircuitBandwidthShapes}.
*
* Example: `10 Gbps`
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java
index ecc822d9f09..35ae313fa12 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVnicDetails.java
@@ -7,7 +7,7 @@
* Contains properties for a VNIC. You use this object when creating the
* primary VNIC during instance launch or when creating a secondary VNIC.
* For more information about VNICs, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
**/
@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
@@ -60,7 +60,7 @@ public static Builder builder() {
/**
* Whether the VNIC should be assigned a public IP address. Defaults to whether
* the subnet is public or private. If not set and the VNIC is being created
- * in a private subnet (i.e., where `prohibitPublicIpOnVnic` = true in the
+ * in a private subnet (that is, where `prohibitPublicIpOnVnic` = true in the
* {@link Subnet}), then no public IP address is assigned.
* If not set and the subnet is public (`prohibitPublicIpOnVnic` = false), then
* a public IP address is assigned. If set to true and
@@ -69,7 +69,7 @@ public static Builder builder() {
**Note:** This public IP address is associated with the primary private IP
* on the VNIC. Secondary private IPs cannot have public IP
* addresses associated with them. For more information, see
- * [Managing IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
+ * [IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
*
* Example: `false`
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java
index 34e409b480a..eadadbe580c 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CreateVolumeDetails.java
@@ -81,7 +81,7 @@ public static Builder builder() {
String displayName;
/**
- * The size of the volume in MBs.
+ * The size of the volume in MBs. The value must be a multiple of 1024.
**/
@com.fasterxml.jackson.annotation.JsonProperty("sizeInMBs")
Long sizeInMBs;
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java
index 7e52a899619..584a544a14c 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnect.java
@@ -15,7 +15,7 @@
*
**Note:** If you're a provider who is setting up a physical connection to Oracle so customers
* can use FastConnect over the connection, be aware that your connection is modeled the
- * same way as a colocated customer's (with `CrossConnect` and `CrossConnectGroup` objects, etc.).
+ * same way as a colocated customer's (with `CrossConnect` and `CrossConnectGroup` objects, and so on).
*
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java
index 727f95fb6f0..929a33d3115 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectGroup.java
@@ -12,7 +12,7 @@
*
**Note:** If you're a provider who is setting up a physical connection to Oracle so customers
* can use FastConnect over the connection, be aware that your connection is modeled the
- * same way as a colocated customer's (with `CrossConnect` and `CrossConnectGroup` objects, etc.).
+ * same way as a colocated customer's (with `CrossConnect` and `CrossConnectGroup` objects, and so on).
*
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java
index 2a78620d2bd..4ffc9796058 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/CrossConnectMapping.java
@@ -92,7 +92,7 @@ public static Builder builder() {
/**
* The OCID of the cross-connect or cross-connect group for this mapping.
* Specified by the owner of the cross-connect or cross-connect group (the
- * customer if the customer is colocated with Oracle; the provider if the
+ * customer if the customer is colocated with Oracle, or the provider if the
* customer is connecting via provider).
*
**/
@@ -115,7 +115,7 @@ public static Builder builder() {
String customerBgpPeeringIp;
/**
- * The IP address for Oracle's end of the BPG session. Must use a /30 or /31
+ * The IP address for Oracle's end of the BGP session. Must use a /30 or /31
* subnet mask. If the session goes from Oracle to a customer's edge router,
* the customer specifies this information. If the session goes from Oracle to
* a provider's edge router, the provider specifies this.
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java
index 22f8ac0da09..05981c385d3 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOption.java
@@ -8,7 +8,7 @@
* The two options available to use are {@link DhcpDnsOption}
* and {@link DhcpSearchDomainOption}. For more
* information, see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm)
- * and [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
+ * and [DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
*
**/
@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java
index 23dbadac384..ae6a27824ed 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpOptions.java
@@ -14,7 +14,7 @@
* a search domain name to use for DNS queries.
*
* For more information, see [DNS in Your Virtual Cloud Network](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/dns.htm)
- * and [Managing DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
+ * and [DHCP Options](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingDHCP.htm).
*
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java
index a77cec8d85b..04c586f63cf 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/DhcpSearchDomainOption.java
@@ -58,7 +58,7 @@ public DhcpSearchDomainOption(java.util.List
* If you don't want to use a search domain name, omit this option from the
* set of DHCP options. Do not include this option with an empty list
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java
new file mode 100644
index 00000000000..bc49d90c547
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/InstanceConsoleConnection.java
@@ -0,0 +1,141 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.model;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Value
+@com.fasterxml.jackson.databind.annotation.JsonDeserialize(
+ builder = InstanceConsoleConnection.Builder.class
+)
+public class InstanceConsoleConnection {
+ @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
+ @lombok.experimental.Accessors(fluent = true)
+ @lombok.Setter
+ public static class Builder {
+ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId")
+ private String compartmentId;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("connectionString")
+ private String connectionString;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("fingerprint")
+ private String fingerprint;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("id")
+ private String id;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("instanceId")
+ private String instanceId;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState")
+ private LifecycleState lifecycleState;
+
+ public InstanceConsoleConnection build() {
+ return new InstanceConsoleConnection(
+ compartmentId, connectionString, fingerprint, id, instanceId, lifecycleState);
+ }
+
+ @com.fasterxml.jackson.annotation.JsonIgnore
+ public Builder copy(InstanceConsoleConnection o) {
+ return compartmentId(o.getCompartmentId())
+ .connectionString(o.getConnectionString())
+ .fingerprint(o.getFingerprint())
+ .id(o.getId())
+ .instanceId(o.getInstanceId())
+ .lifecycleState(o.getLifecycleState());
+ }
+ }
+
+ /**
+ * Create a new builder.
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * The OCID of the compartment to contain the ConsoleConnection
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("compartmentId")
+ @javax.validation.constraints.Size(min = 1, max = 255)
+ String compartmentId;
+
+ /**
+ * The ssh connection string to the instance console
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("connectionString")
+ String connectionString;
+
+ /**
+ * The fingerprint of the ssh publicKey.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("fingerprint")
+ String fingerprint;
+
+ /**
+ * The OCID of the instance console connection
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("id")
+ String id;
+
+ /**
+ * The host instance OCID
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("instanceId")
+ String instanceId;
+ /**
+ * The current state of the instance console connection.
+ **/
+ @lombok.extern.slf4j.Slf4j
+ public enum LifecycleState {
+ Active("ACTIVE"),
+ Creating("CREATING"),
+ Deleted("DELETED"),
+ Deleting("DELETING"),
+ Failed("FAILED"),
+
+ /**
+ * This value is used if a service returns a value for this enum that is not recognized by this
+ * version of the SDK.
+ */
+ UnknownEnumValue(null);
+
+ private final String value;
+ private static java.util.Map
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java
index 37d86f75c6a..1b5e35b1ef1 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/PrivateIp.java
@@ -15,7 +15,7 @@
*
* You can add *secondary private IPs* to a VNIC after it's created. For more
* information, see the `privateIp` operations and also
- * [Managing IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
+ * [IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
*
**Note:** Only
* {@link #listPrivateIps(ListPrivateIpsRequest) listPrivateIps} and
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java
index 2cf16993e87..84ca4f43b0c 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/SecurityList.java
@@ -9,7 +9,7 @@
* in the subnet. The rules can be stateful or stateless. For more information, see
* [Security Lists](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/securitylists.htm).
*
- **Important:** Oracle Bare Metal Cloud Services images automatically include firewall rules (e.g.,
+ **Important:** Oracle Bare Metal Cloud Services images automatically include firewall rules (for example,
* Linux iptables, Windows firewall). If there are issues with some type of access to an instance,
* make sure both the security lists associated with the instance's subnet and the instance's
* firewall rules are set correctly.
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java
index 4d8443c7ea8..14116eba815 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Subnet.java
@@ -8,7 +8,7 @@
* consists of a contiguous range of IP addresses that do not overlap with
* other subnets in the VCN. Example: 172.16.1.0/24. For more information, see
* [Overview of the Networking Service](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Concepts/overview.htm) and
- * [Managing Subnets](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingsubnets.htm).
+ * [VCNs and Subnets](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVCNs.htm).
*
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
@@ -172,7 +172,7 @@ public static Builder builder() {
/**
* A DNS label for the subnet, used in conjunction with the VNIC's hostname and
* VCN's DNS label to form a fully qualified domain name (FQDN) for each VNIC
- * within this subnet (e.g., `bminstance-1.subnet123.vcn1.oraclevcn.com`).
+ * within this subnet (for example, `bminstance-1.subnet123.vcn1.oraclevcn.com`).
* Must be an alphanumeric string that begins with a letter and is unique within the VCN.
* The value cannot be changed.
*
@@ -261,7 +261,7 @@ public static LifecycleState create(String key) {
* `assignPublicIp` flag in
* {@link CreateVnicDetails}).
* If `prohibitPublicIpOnVnic` is set to true, VNICs created in this
- * subnet cannot have public IP addresses (i.e., it's a private
+ * subnet cannot have public IP addresses (that is, it's a private
* subnet).
*
* Example: `true`
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java
index a1aef8a58ee..f4820e45ecd 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/UpdateVirtualCircuitDetails.java
@@ -66,7 +66,7 @@ public static Builder builder() {
/**
* The provisioned data rate of the connection. To get a list of the
- * available bandwidth levels (i.e., shapes), see
+ * available bandwidth levels (that is, shapes), see
* {@link #listVirtualCircuitBandwidthShapes(ListVirtualCircuitBandwidthShapesRequest) listVirtualCircuitBandwidthShapes}.
*
* To be updated only by the customer who owns the virtual circuit.
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java
index d70f0ba2566..c7083c541b9 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vcn.java
@@ -146,7 +146,7 @@ public static Builder builder() {
/**
* A DNS label for the VCN, used in conjunction with the VNIC's hostname and
* subnet's DNS label to form a fully qualified domain name (FQDN) for each VNIC
- * within this subnet (e.g., `bminstance-1.subnet123.vcn1.oraclevcn.com`).
+ * within this subnet (for example, `bminstance-1.subnet123.vcn1.oraclevcn.com`).
* Must be an alphanumeric string that begins with a letter.
* The value cannot be changed.
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java
index 183b3f51b26..2d88774defd 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VirtualCircuit.java
@@ -10,7 +10,7 @@
* network connections to provide a single, logical connection between the edge router
* on the customer's existing network and a DRG. A customer could have multiple virtual
* circuits, for example, to isolate traffic from different parts of their organization
- * (one virtual circuit for 10.0.1.0/24; another for 172.16.0.0/16), or to provide redundancy.
+ * (one virtual circuit for 10.0.1.0/24, another for 172.16.0.0/16), or to provide redundancy.
*
* Each virtual circuit is made up of information shared between a customer, Oracle,
* and a provider (if the customer is using FastConnect via a provider). Who fills in
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java
index daf52b9236a..d0e190d43d0 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Vnic.java
@@ -9,12 +9,12 @@
* through that subnet. Each instance has a *primary VNIC* that is automatically
* created and attached during launch. You can add *secondary VNICs* to an
* instance after it's launched. For more information, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
* Each VNIC has a *primary private IP* that is automatically assigned during launch.
* You can add *secondary private IPs* to a VNIC after it's created. For more
* information, see {@link #createPrivateIp(CreatePrivateIpRequest) createPrivateIp} and
- * [Managing IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
+ * [IP Addresses](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingIPaddresses.htm).
*
* To use any of the API operations, you must be authorized in an IAM policy. If you're not authorized,
* talk to an administrator. If you're an administrator who needs to write policies to give users access, see
@@ -138,7 +138,7 @@ public static Builder builder() {
/**
* The hostname for the VNIC's primary private IP. Used for DNS. The value is the hostname
* portion of the primary private IP's fully qualified domain name (FQDN)
- * (e.g., `bminstance-1` in FQDN `bminstance-1.subnet123.vcn1.oraclevcn.com`).
+ * (for example, `bminstance-1` in FQDN `bminstance-1.subnet123.vcn1.oraclevcn.com`).
* Must be unique across all VNICs in the subnet and comply with
* [RFC 952](https://tools.ietf.org/html/rfc952) and
* [RFC 1123](https://tools.ietf.org/html/rfc1123).
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java
index c7d9959f875..bbbb955501c 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VnicAttachment.java
@@ -5,7 +5,7 @@
/**
* Represents an attachment between a VNIC and an instance. For more information, see
- * [Managing Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
+ * [Virtual Network Interface Cards (VNICs)](https://docs.us-phoenix-1.oraclecloud.com/Content/Network/Tasks/managingVNICs.htm).
*
**/
@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java
index 43bda1c5f0c..a4b6cdbbfe9 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/Volume.java
@@ -171,7 +171,7 @@ public static LifecycleState create(String key) {
LifecycleState lifecycleState;
/**
- * The size of the volume in MBs.
+ * The size of the volume in MBs. The value must be a multiple of 1024.
**/
@com.fasterxml.jackson.annotation.JsonProperty("sizeInMBs")
@javax.validation.Valid
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java
index 959a8fc5fc6..ba0f4fefdcd 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/model/VolumeBackup.java
@@ -169,7 +169,7 @@ public static LifecycleState create(String key) {
LifecycleState lifecycleState;
/**
- * The size of the volume, in MBs.
+ * The size of the volume, in MBs. The value must be a multiple of 1024.
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("sizeInMBs")
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java
index d69ab5175eb..87073a4a9b8 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVnicRequest.java
@@ -18,7 +18,7 @@ public class AttachVnicRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java
index 846eaee7516..fb9c6685feb 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/AttachVolumeRequest.java
@@ -18,7 +18,7 @@ public class AttachVolumeRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java
index 4d33d6ebd31..8a11c7129ff 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CaptureConsoleHistoryRequest.java
@@ -18,7 +18,7 @@ public class CaptureConsoleHistoryRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java
index 664ecfc7552..2f6e5b2c361 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCpeRequest.java
@@ -18,7 +18,7 @@ public class CreateCpeRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java
index 26a986b47c4..fb0fa1afc95 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectGroupRequest.java
@@ -18,7 +18,7 @@ public class CreateCrossConnectGroupRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java
index 0fde268ee45..ab61eddbd6e 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateCrossConnectRequest.java
@@ -18,7 +18,7 @@ public class CreateCrossConnectRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java
index 9701bff7d68..5e888ab182f 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDhcpOptionsRequest.java
@@ -18,7 +18,7 @@ public class CreateDhcpOptionsRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java
index 24d773c6724..e4ae0684e8b 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgAttachmentRequest.java
@@ -18,7 +18,7 @@ public class CreateDrgAttachmentRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java
index fba32e7beab..47a7ae945e8 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateDrgRequest.java
@@ -18,7 +18,7 @@ public class CreateDrgRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java
index bc8d741265e..5b90d492054 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateIPSecConnectionRequest.java
@@ -18,7 +18,7 @@ public class CreateIPSecConnectionRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java
index 19d580ded62..ec8cf812500 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateImageRequest.java
@@ -18,7 +18,7 @@ public class CreateImageRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java
new file mode 100644
index 00000000000..f8e86053d60
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInstanceConsoleConnectionRequest.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.requests;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class CreateInstanceConsoleConnectionRequest {
+
+ /**
+ * Request object for creating an InstanceConsoleConnection
+ */
+ private CreateInstanceConsoleConnectionDetails createInstanceConsoleConnectionDetails;
+
+ /**
+ * 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).
+ *
+ */
+ private String opcRetryToken;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(CreateInstanceConsoleConnectionRequest o) {
+ createInstanceConsoleConnectionDetails(o.getCreateInstanceConsoleConnectionDetails());
+ opcRetryToken(o.getOpcRetryToken());
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java
index bb4e7d6fb3c..1669771429d 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateInternetGatewayRequest.java
@@ -18,7 +18,7 @@ public class CreateInternetGatewayRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java
index 9818cb94f26..877264af5ea 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreatePrivateIpRequest.java
@@ -18,7 +18,7 @@ public class CreatePrivateIpRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java
index 8ec98b2941a..f14b199e356 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateRouteTableRequest.java
@@ -18,7 +18,7 @@ public class CreateRouteTableRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java
index d3c4aef108b..40366512f2c 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSecurityListRequest.java
@@ -18,7 +18,7 @@ public class CreateSecurityListRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java
index 7ac980a5d8d..bcdce4f5d52 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateSubnetRequest.java
@@ -18,7 +18,7 @@ public class CreateSubnetRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java
index 2f144cb60dc..4bc8bb56b8b 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVcnRequest.java
@@ -18,7 +18,7 @@ public class CreateVcnRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java
index 37f2b9c6a52..de83ac18839 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVirtualCircuitRequest.java
@@ -18,7 +18,7 @@ public class CreateVirtualCircuitRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java
index 8f3aa0f0321..76ddebdfba9 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeBackupRequest.java
@@ -18,7 +18,7 @@ public class CreateVolumeBackupRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java
index bc84e089695..e9c122bfbfc 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/CreateVolumeRequest.java
@@ -18,7 +18,7 @@ public class CreateVolumeRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java
new file mode 100644
index 00000000000..feefa0e7da6
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/DeleteInstanceConsoleConnectionRequest.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.requests;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class DeleteInstanceConsoleConnectionRequest {
+
+ /**
+ * The OCID of the intance console connection
+ */
+ private String instanceConsoleConnectionId;
+
+ /**
+ * 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.
+ *
+ */
+ private String ifMatch;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(DeleteInstanceConsoleConnectionRequest o) {
+ instanceConsoleConnectionId(o.getInstanceConsoleConnectionId());
+ ifMatch(o.getIfMatch());
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java
index 684b972c854..b8dcb6dcd86 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ExportImageRequest.java
@@ -23,7 +23,7 @@ public class ExportImageRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java
new file mode 100644
index 00000000000..cec1448a260
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/GetInstanceConsoleConnectionRequest.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.requests;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class GetInstanceConsoleConnectionRequest {
+
+ /**
+ * The OCID of the intance console connection
+ */
+ private String instanceConsoleConnectionId;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(GetInstanceConsoleConnectionRequest o) {
+ instanceConsoleConnectionId(o.getInstanceConsoleConnectionId());
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java
index 2b56a025822..0a6ef100174 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/InstanceActionRequest.java
@@ -23,7 +23,7 @@ public class InstanceActionRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java
index 16e7b66dd28..1bd5537eb7d 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/LaunchInstanceRequest.java
@@ -18,7 +18,7 @@ public class LaunchInstanceRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java
new file mode 100644
index 00000000000..2ba868fa942
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/ListInstanceConsoleConnectionsRequest.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.requests;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class ListInstanceConsoleConnectionsRequest {
+
+ /**
+ * The OCID of the compartment.
+ */
+ private String compartmentId;
+
+ /**
+ * The OCID of the instance.
+ */
+ private String instanceId;
+
+ /**
+ * The maximum number of items to return in a paginated \"List\" call.
+ *
+ * Example: `500`
+ *
+ */
+ private Integer limit;
+
+ /**
+ * The value of the `opc-next-page` response header from the previous \"List\" call.
+ *
+ */
+ private String page;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(ListInstanceConsoleConnectionsRequest o) {
+ compartmentId(o.getCompartmentId());
+ instanceId(o.getInstanceId());
+ limit(o.getLimit());
+ page(o.getPage());
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java
index 42beea5daf4..8db99ad1608 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateImageRequest.java
@@ -23,7 +23,7 @@ public class UpdateImageRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java
index 526611886e7..5c478675d0e 100644
--- a/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/requests/UpdateInstanceRequest.java
@@ -23,7 +23,7 @@ public class UpdateInstanceRequest {
/**
* 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 (e.g., if a resource
+ * 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).
*
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInstanceConsoleConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInstanceConsoleConnectionResponse.java
new file mode 100644
index 00000000000..046559b6f53
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/CreateInstanceConsoleConnectionResponse.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.responses;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class CreateInstanceConsoleConnectionResponse {
+
+ /**
+ * For optimistic concurrency control. See `if-match`.
+ */
+ private String etag;
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about
+ * a particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ /**
+ * The returned InstanceConsoleConnection instance.
+ */
+ private InstanceConsoleConnection instanceConsoleConnection;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(CreateInstanceConsoleConnectionResponse o) {
+ etag(o.getEtag());
+ opcRequestId(o.getOpcRequestId());
+ instanceConsoleConnection(o.getInstanceConsoleConnection());
+
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInstanceConsoleConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInstanceConsoleConnectionResponse.java
new file mode 100644
index 00000000000..696ba34ab6b
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/DeleteInstanceConsoleConnectionResponse.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.responses;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class DeleteInstanceConsoleConnectionResponse {
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about
+ * a particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(DeleteInstanceConsoleConnectionResponse o) {
+ opcRequestId(o.getOpcRequestId());
+
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceConsoleConnectionResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceConsoleConnectionResponse.java
new file mode 100644
index 00000000000..c7bd5217e3b
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/GetInstanceConsoleConnectionResponse.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.responses;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class GetInstanceConsoleConnectionResponse {
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about
+ * a particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ /**
+ * The returned InstanceConsoleConnection instance.
+ */
+ private InstanceConsoleConnection instanceConsoleConnection;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(GetInstanceConsoleConnectionResponse o) {
+ opcRequestId(o.getOpcRequestId());
+ instanceConsoleConnection(o.getInstanceConsoleConnection());
+
+ return this;
+ }
+ }
+}
diff --git a/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstanceConsoleConnectionsResponse.java b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstanceConsoleConnectionsResponse.java
new file mode 100644
index 00000000000..a3c3b269042
--- /dev/null
+++ b/bmc-core/src/main/java/com/oracle/bmc/core/responses/ListInstanceConsoleConnectionsResponse.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.core.responses;
+
+import com.oracle.bmc.core.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class ListInstanceConsoleConnectionsResponse {
+
+ /**
+ * For pagination of a list of items. When paging through a list, if this header appears in the response,
+ * then a partial list might have been returned. Include this value as the `page` parameter for the
+ * subsequent GET request to get the next batch of items.
+ *
+ */
+ private String opcNextPage;
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about
+ * a particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ /**
+ * A list of InstanceConsoleConnection instances.
+ */
+ private java.util.List
+ * You must specify a *description* for the secret key (although it can be an empty string). It does not
+ * have to be unique, and you can change it anytime with
+ * {@link #updateCustomerSecretKey(UpdateCustomerSecretKeyRequest) updateCustomerSecretKey}.
+ *
+ * Every user has permission to create a secret key for *their own user ID*. An administrator in your organization
+ * does not need to write a policy to give users this ability. To compare, administrators who have permission to the
+ * tenancy can use this operation to create a secret key for any user, including themselves.
+ *
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ CreateCustomerSecretKeyResponse createCustomerSecretKey(CreateCustomerSecretKeyRequest request);
+
/**
* Creates a new group in your tenancy.
*
@@ -269,6 +288,15 @@ CreateRegionSubscriptionResponse createRegionSubscription(
*/
DeleteApiKeyResponse deleteApiKey(DeleteApiKeyRequest request);
+ /**
+ * Deletes the specified secret key for the specified user.
+ *
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ DeleteCustomerSecretKeyResponse deleteCustomerSecretKey(DeleteCustomerSecretKeyRequest request);
+
/**
* Deletes the specified group. The group must be empty.
*
@@ -432,6 +460,16 @@ CreateRegionSubscriptionResponse createRegionSubscription(
*/
ListCompartmentsResponse listCompartments(ListCompartmentsRequest request);
+ /**
+ * Lists the secret keys for the specified user. The returned object contains the secret key's OCID, but not
+ * the secret key itself. The actual secret key is returned only upon creation.
+ *
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ ListCustomerSecretKeysResponse listCustomerSecretKeys(ListCustomerSecretKeysRequest request);
+
/**
* Lists the groups in your tenancy. You must specify your tenancy's OCID as the value for
* the compartment ID (remember that the tenancy is simply the root compartment).
@@ -548,6 +586,15 @@ ListUserGroupMembershipsResponse listUserGroupMemberships(
*/
UpdateCompartmentResponse updateCompartment(UpdateCompartmentRequest request);
+ /**
+ * Updates the specified secret key's description.
+ *
+ * @param request The request object containing the details to send
+ * @return A response object containing details about the completed operation
+ * @throws BmcException when an error occurs.
+ */
+ UpdateCustomerSecretKeyResponse updateCustomerSecretKey(UpdateCustomerSecretKeyRequest request);
+
/**
* Updates the specified group.
* @param request The request object containing the details to send
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java
index 35a98cc15ff..f2b0ac59464 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/IdentityAsync.java
@@ -90,6 +90,33 @@ java.util.concurrent.Future
+ * You must specify a *description* for the secret key (although it can be an empty string). It does not
+ * have to be unique, and you can change it anytime with
+ * {@link #updateCustomerSecretKey(UpdateCustomerSecretKeyRequest, Consumer, Consumer) updateCustomerSecretKey}.
+ *
+ * Every user has permission to create a secret key for *their own user ID*. An administrator in your organization
+ * does not need to write a policy to give users this ability. To compare, administrators who have permission to the
+ * tenancy can use this operation to create a secret key for any user, including themselves.
+ *
+ *
+ * @param request The request object containing the details to send
+ * @param handler The request handler to invoke upon completion, may be null.
+ * @return A Future that can be used to get the response if no AsyncHandler was
+ * provided. Note, if you provide an AsyncHandler and use the Future, some
+ * types of responses (like java.io.InputStream) may not be able to be read in
+ * both places as the underlying stream may only be consumed once.
+ */
+ java.util.concurrent.Future
@@ -349,6 +376,23 @@ java.util.concurrent.Future
* Example: `IDCS`
*
**/
public enum ProductType {
Idcs("IDCS"),
+ Adfs("ADFS"),
;
private final String value;
@@ -89,7 +92,9 @@ public static ProductType create(String key) {
}
};
/**
- * The identity provider service or product (e.g., Oracle Identity Cloud Service).
+ * The identity provider service or product.
+ * Supported identity providers are Oracle Identity Cloud Service (IDCS) and Microsoft
+ * Active Directory Federation Services (ADFS).
*
* Example: `IDCS`
*
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java
index e75a1a5b940..3c70aba10fd 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CreateRegionSubscriptionDetails.java
@@ -39,6 +39,7 @@ public static Builder builder() {
* Allowed values are:
* - `PHX`
* - `IAD`
+ * - `FRA`
*
* Example: `PHX`
*
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java
new file mode 100644
index 00000000000..d2a8246c204
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/CustomerSecretKey.java
@@ -0,0 +1,190 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.model;
+
+/**
+ * A `CustomerSecretKey` is an Oracle-provided key for using the Object Storage Service's
+ * [Amazon S3 compatible API](https://docs.us-phoenix-1.oraclecloud.com/Content/Object/Tasks/s3compatibleapi.htm).
+ * A user can have up to two secret keys at a time.
+ *
+ **Note:** The secret key is always an Oracle-generated string; you can't change it to a string of your choice.
+ *
+ * For more information, see [Managing User Credentials](https://docs.us-phoenix-1.oraclecloud.com/Content/Identity/Tasks/managingcredentials.htm).
+ *
+ **/
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Value
+@com.fasterxml.jackson.databind.annotation.JsonDeserialize(
+ builder = CustomerSecretKey.Builder.class
+)
+public class CustomerSecretKey {
+ @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
+ @lombok.experimental.Accessors(fluent = true)
+ @lombok.Setter
+ public static class Builder {
+ @com.fasterxml.jackson.annotation.JsonProperty("key")
+ private String key;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("id")
+ private String id;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("userId")
+ private String userId;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("displayName")
+ private String displayName;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("timeCreated")
+ private java.util.Date timeCreated;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("timeExpires")
+ private java.util.Date timeExpires;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("lifecycleState")
+ private LifecycleState lifecycleState;
+
+ @com.fasterxml.jackson.annotation.JsonProperty("inactiveStatus")
+ private Long inactiveStatus;
+
+ public CustomerSecretKey build() {
+ return new CustomerSecretKey(
+ key,
+ id,
+ userId,
+ displayName,
+ timeCreated,
+ timeExpires,
+ lifecycleState,
+ inactiveStatus);
+ }
+
+ @com.fasterxml.jackson.annotation.JsonIgnore
+ public Builder copy(CustomerSecretKey o) {
+ return key(o.getKey())
+ .id(o.getId())
+ .userId(o.getUserId())
+ .displayName(o.getDisplayName())
+ .timeCreated(o.getTimeCreated())
+ .timeExpires(o.getTimeExpires())
+ .lifecycleState(o.getLifecycleState())
+ .inactiveStatus(o.getInactiveStatus());
+ }
+ }
+
+ /**
+ * Create a new builder.
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * The secret key.
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("key")
+ String key;
+
+ /**
+ * The OCID of the secret key.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("id")
+ String id;
+
+ /**
+ * The OCID of the user the password belongs to.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("userId")
+ String userId;
+
+ /**
+ * The display name you assign to the secret key. Does not have to be unique, and it's changeable.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("displayName")
+ String displayName;
+
+ /**
+ * Date and time the `CustomerSecretKey` object was created, in the format defined by RFC3339.
+ *
+ * Example: `2016-08-25T21:10:29.600Z`
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("timeCreated")
+ java.util.Date timeCreated;
+
+ /**
+ * Date and time when this password will expire, in the format defined by RFC3339.
+ * Null if it never expires.
+ *
+ * Example: `2016-08-25T21:10:29.600Z`
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("timeExpires")
+ java.util.Date timeExpires;
+ /**
+ * The secret key's current state. After creating a secret key, make sure its `lifecycleState` changes from
+ * CREATING to ACTIVE before using it.
+ *
+ **/
+ @lombok.extern.slf4j.Slf4j
+ public enum LifecycleState {
+ Creating("CREATING"),
+ Active("ACTIVE"),
+ Inactive("INACTIVE"),
+ Deleting("DELETING"),
+ Deleted("DELETED"),
+
+ /**
+ * This value is used if a service returns a value for this enum that is not recognized by this
+ * version of the SDK.
+ */
+ UnknownEnumValue(null);
+
+ private final String value;
+ private static java.util.Map
+ * Example: `2016-08-25T21:10:29.600Z`
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("timeCreated")
+ java.util.Date timeCreated;
+
+ /**
+ * Date and time when this password will expire, in the format defined by RFC3339.
+ * Null if it never expires.
+ *
+ * Example: `2016-08-25T21:10:29.600Z`
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("timeExpires")
+ java.util.Date timeExpires;
+ /**
+ * The secret key's current state. After creating a secret key, make sure its `lifecycleState` changes from
+ * CREATING to ACTIVE before using it.
+ *
+ **/
+ @lombok.extern.slf4j.Slf4j
+ public enum LifecycleState {
+ Creating("CREATING"),
+ Active("ACTIVE"),
+ Inactive("INACTIVE"),
+ Deleting("DELETING"),
+ Deleted("DELETED"),
+
+ /**
+ * This value is used if a service returns a value for this enum that is not recognized by this
+ * version of the SDK.
+ */
+ UnknownEnumValue(null);
+
+ private final String value;
+ private static java.util.Map
+ * Allowed values are:
+ * - `ADFS`
+ * - `IDCS`
*
* Example: `IDCS`
*
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java
index 77fc769dec7..3dacd9e78a3 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Region.java
@@ -50,6 +50,7 @@ public static Builder builder() {
* Allowed values are:
* - `PHX`
* - `IAD`
+ * - 'FRA'
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("key")
@@ -62,6 +63,7 @@ public static Builder builder() {
* Allowed values are:
* - `us-phoenix-1`
* - `us-ashburn-1`
+ * - 'de-frankfurt-1'
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("name")
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java
index 5f75fb885f8..cb870cf5c1d 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/RegionSubscription.java
@@ -60,6 +60,7 @@ public static Builder builder() {
* Allowed values are:
* - `PHX`
* - `IAD`
+ * - 'FRA'
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("regionKey")
@@ -74,6 +75,7 @@ public static Builder builder() {
* Allowed values are:
* - `us-phoenix-1`
* - `us-ashburn-1`
+ * - 'de-frankfurt-1'
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("regionName")
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java
index 51529d01cf1..13bc9cc9aee 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/Tenancy.java
@@ -78,6 +78,7 @@ public static Builder builder() {
* Allowed values are:
* - `IAD`
* - `PHX`
+ * - `FRA`
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("homeRegionKey")
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java
index 9df5ee9f1da..3f947084bec 100644
--- a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCompartmentDetails.java
@@ -16,13 +16,16 @@ public static class Builder {
@com.fasterxml.jackson.annotation.JsonProperty("description")
private String description;
+ @com.fasterxml.jackson.annotation.JsonProperty("name")
+ private String name;
+
public UpdateCompartmentDetails build() {
- return new UpdateCompartmentDetails(description);
+ return new UpdateCompartmentDetails(description, name);
}
@com.fasterxml.jackson.annotation.JsonIgnore
public Builder copy(UpdateCompartmentDetails o) {
- return description(o.getDescription());
+ return description(o.getDescription()).name(o.getName());
}
}
@@ -39,4 +42,12 @@ public static Builder builder() {
@com.fasterxml.jackson.annotation.JsonProperty("description")
@javax.validation.constraints.Size(min = 1, max = 400)
String description;
+
+ /**
+ * The new name you assign to the compartment. The name must be unique across all compartments in the tenancy.
+ *
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("name")
+ @javax.validation.constraints.Size(min = 1, max = 100)
+ String name;
}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java
new file mode 100644
index 00000000000..6be7ab6f523
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/model/UpdateCustomerSecretKeyDetails.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.model;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Value
+@com.fasterxml.jackson.databind.annotation.JsonDeserialize(
+ builder = UpdateCustomerSecretKeyDetails.Builder.class
+)
+public class UpdateCustomerSecretKeyDetails {
+ @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
+ @lombok.experimental.Accessors(fluent = true)
+ @lombok.Setter
+ public static class Builder {
+ @com.fasterxml.jackson.annotation.JsonProperty("displayName")
+ private String displayName;
+
+ public UpdateCustomerSecretKeyDetails build() {
+ return new UpdateCustomerSecretKeyDetails(displayName);
+ }
+
+ @com.fasterxml.jackson.annotation.JsonIgnore
+ public Builder copy(UpdateCustomerSecretKeyDetails o) {
+ return displayName(o.getDisplayName());
+ }
+ }
+
+ /**
+ * Create a new builder.
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * The description you assign to the secret key. Does not have to be unique, and it's changeable.
+ **/
+ @com.fasterxml.jackson.annotation.JsonProperty("displayName")
+ String displayName;
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java
new file mode 100644
index 00000000000..6a20723ed95
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/CreateCustomerSecretKeyRequest.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.requests;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class CreateCustomerSecretKeyRequest {
+
+ /**
+ * Request object for creating a new secret key.
+ */
+ private CreateCustomerSecretKeyDetails createCustomerSecretKeyDetails;
+
+ /**
+ * The OCID of the user.
+ */
+ private String userId;
+
+ /**
+ * 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 (e.g., if a resource
+ * has been deleted and purged from the system, then a retry of the original creation request
+ * may be rejected).
+ *
+ */
+ private String opcRetryToken;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(CreateCustomerSecretKeyRequest o) {
+ createCustomerSecretKeyDetails(o.getCreateCustomerSecretKeyDetails());
+ userId(o.getUserId());
+ opcRetryToken(o.getOpcRetryToken());
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java
new file mode 100644
index 00000000000..efe37da48d3
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/DeleteCustomerSecretKeyRequest.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.requests;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class DeleteCustomerSecretKeyRequest {
+
+ /**
+ * The OCID of the user.
+ */
+ private String userId;
+
+ /**
+ * The OCID of the secret key.
+ */
+ private String customerSecretKeyId;
+
+ /**
+ * 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.
+ *
+ */
+ private String ifMatch;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(DeleteCustomerSecretKeyRequest o) {
+ userId(o.getUserId());
+ customerSecretKeyId(o.getCustomerSecretKeyId());
+ ifMatch(o.getIfMatch());
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java
new file mode 100644
index 00000000000..a39fb26a9c4
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/ListCustomerSecretKeysRequest.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.requests;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class ListCustomerSecretKeysRequest {
+
+ /**
+ * The OCID of the user.
+ */
+ private String userId;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(ListCustomerSecretKeysRequest o) {
+ userId(o.getUserId());
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java
new file mode 100644
index 00000000000..d5df0700cdc
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/requests/UpdateCustomerSecretKeyRequest.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.requests;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class UpdateCustomerSecretKeyRequest {
+
+ /**
+ * The OCID of the user.
+ */
+ private String userId;
+
+ /**
+ * The OCID of the secret key.
+ */
+ private String customerSecretKeyId;
+
+ /**
+ * Request object for updating a secret key.
+ */
+ private UpdateCustomerSecretKeyDetails updateCustomerSecretKeyDetails;
+
+ /**
+ * 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.
+ *
+ */
+ private String ifMatch;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(UpdateCustomerSecretKeyRequest o) {
+ userId(o.getUserId());
+ customerSecretKeyId(o.getCustomerSecretKeyId());
+ updateCustomerSecretKeyDetails(o.getUpdateCustomerSecretKeyDetails());
+ ifMatch(o.getIfMatch());
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCustomerSecretKeyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCustomerSecretKeyResponse.java
new file mode 100644
index 00000000000..56316bca30a
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/CreateCustomerSecretKeyResponse.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.responses;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class CreateCustomerSecretKeyResponse {
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a
+ * particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ /**
+ * For optimistic concurrency control. See `if-match`.
+ */
+ private String etag;
+
+ /**
+ * The returned CustomerSecretKey instance.
+ */
+ private CustomerSecretKey customerSecretKey;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(CreateCustomerSecretKeyResponse o) {
+ opcRequestId(o.getOpcRequestId());
+ etag(o.getEtag());
+ customerSecretKey(o.getCustomerSecretKey());
+
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteCustomerSecretKeyResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteCustomerSecretKeyResponse.java
new file mode 100644
index 00000000000..c3a67469d88
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/DeleteCustomerSecretKeyResponse.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.responses;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class DeleteCustomerSecretKeyResponse {
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a
+ * particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ public static class Builder {
+ /**
+ * Copy method to populate the builder with values from the given instance.
+ * @return this builder instance
+ */
+ public Builder copy(DeleteCustomerSecretKeyResponse o) {
+ opcRequestId(o.getOpcRequestId());
+
+ return this;
+ }
+ }
+}
diff --git a/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCustomerSecretKeysResponse.java b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCustomerSecretKeysResponse.java
new file mode 100644
index 00000000000..048efe07171
--- /dev/null
+++ b/bmc-identity/src/main/java/com/oracle/bmc/identity/responses/ListCustomerSecretKeysResponse.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.identity.responses;
+
+import com.oracle.bmc.identity.model.*;
+
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20160918")
+@lombok.Builder(builderClassName = "Builder")
+@lombok.Getter
+public class ListCustomerSecretKeysResponse {
+
+ /**
+ * Unique Oracle-assigned identifier for the request. If you need to contact Oracle about a
+ * particular request, please provide the request ID.
+ *
+ */
+ private String opcRequestId;
+
+ /**
+ * For pagination of a list of items. When paging through a list, if this header appears in the response,
+ * then a partial list might have been returned. Include this value as the `page` parameter for the
+ * subsequent GET request to get the next batch of items.
+ *
+ */
+ private String opcNextPage;
+
+ /**
+ * A list of CustomerSecretKeySummary instances.
+ */
+ private java.util.List
- * Example: `My first backend server`
+ * Example: `10.10.10.4:8080`
*
**/
@com.fasterxml.jackson.annotation.JsonProperty("name")
diff --git a/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java
new file mode 100644
index 00000000000..94cb8568511
--- /dev/null
+++ b/bmc-loadbalancer/src/main/java/com/oracle/bmc/loadbalancer/model/BackendHealth.java
@@ -0,0 +1,122 @@
+/**
+ * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ */
+package com.oracle.bmc.loadbalancer.model;
+
+/**
+ * The health status of the specified backend server as reported by the primary and stand-by load balancers.
+ *
+ **/
+@javax.annotation.Generated(value = "OracleSDKGenerator", comments = "API Version: 20170115")
+@lombok.Value
+@com.fasterxml.jackson.databind.annotation.JsonDeserialize(builder = BackendHealth.Builder.class)
+public class BackendHealth {
+ @com.fasterxml.jackson.databind.annotation.JsonPOJOBuilder(withPrefix = "")
+ @lombok.experimental.Accessors(fluent = true)
+ @lombok.Setter
+ public static class Builder {
+ @com.fasterxml.jackson.annotation.JsonProperty("healthCheckResults")
+ private java.util.List