feat(merge-patch): Update vpc service with API version 2020-10-06 (#9)

* feat(merge-patch): Update vpc service with API version 2020-10-06

* fix(travis): update travis build

Author: astha-jain

.travis.yml

@@ -42,7 +42,7 @@ before_script:
       && mvn versions:set -DnewVersion=${TRAVIS_TAG} -DgenerateBackupPoms=false
       || true
 script:
--  mvn clean verify $MVN_ARGS
+-  mvn clean verify -DskipITs $MVN_ARGS
 
 before_deploy:
 - pip install --user bump2version

Makefile

@@ -2,4 +2,4 @@ package:
 	mvn package
 
 install:
-	mvn clean install
+	mvn clean install -DskipITs

modules/vpc/src/main/java/com/ibm/cloud/is/vpc/v1/Vpc.java

@@ -0,0 +1,131 @@
+/*
+ * (C) Copyright IBM Corp. 2020.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.ibm.cloud.is.vpc.v1.model;
+
+import java.util.Map;
+
+import com.google.gson.annotations.SerializedName;
+import com.ibm.cloud.sdk.core.service.model.GenericModel;
+import com.ibm.cloud.sdk.core.util.GsonSingleton;
+
+/**
+ * AddressPrefixPatch.
+ */
+public class AddressPrefixPatch extends GenericModel {
+
+  protected String name;
+  @SerializedName("is_default")
+  protected Boolean isDefault;
+
+  /**
+   * Builder.
+   */
+  public static class Builder {
+    private String name;
+    private Boolean isDefault;
+
+    private Builder(AddressPrefixPatch addressPrefixPatch) {
+      this.name = addressPrefixPatch.name;
+      this.isDefault = addressPrefixPatch.isDefault;
+    }
+
+    /**
+     * Instantiates a new builder.
+     */
+    public Builder() {
+    }
+
+    /**
+     * Builds a AddressPrefixPatch.
+     *
+     * @return the new AddressPrefixPatch instance
+     */
+    public AddressPrefixPatch build() {
+      return new AddressPrefixPatch(this);
+    }
+
+    /**
+     * Set the name.
+     *
+     * @param name the name
+     * @return the AddressPrefixPatch builder
+     */
+    public Builder name(String name) {
+      this.name = name;
+      return this;
+    }
+
+    /**
+     * Set the isDefault.
+     *
+     * @param isDefault the isDefault
+     * @return the AddressPrefixPatch builder
+     */
+    public Builder isDefault(Boolean isDefault) {
+      this.isDefault = isDefault;
+      return this;
+    }
+  }
+
+  protected AddressPrefixPatch(Builder builder) {
+    name = builder.name;
+    isDefault = builder.isDefault;
+  }
+
+  /**
+   * New builder.
+   *
+   * @return a AddressPrefixPatch builder
+   */
+  public Builder newBuilder() {
+    return new Builder(this);
+  }
+
+  /**
+   * Gets the name.
+   *
+   * The user-defined name for this address prefix. Names must be unique within the VPC the address prefix resides in.
+   *
+   * @return the name
+   */
+  public String name() {
+    return name;
+  }
+
+  /**
+   * Gets the isDefault.
+   *
+   * Indicates whether this is the default prefix for this zone in this VPC. Updating to true makes this prefix the
+   * default prefix for this zone in this VPC, provided the VPC currently has no default address prefix for this zone.
+   * Updating to false removes the default prefix for this zone in this VPC.
+   *
+   * @return the isDefault
+   */
+  public Boolean isDefault() {
+    return isDefault;
+  }
+
+  /**
+   * Construct a JSON merge-patch from the AddressPrefixPatch.
+   *
+   * Note that properties of the AddressPrefixPatch with null values are not represented in the constructed
+   * JSON merge-patch object, but can be explicitly set afterward to signify a property delete.
+   *
+   * @return a JSON merge-patch for the AddressPrefixPatch
+   */
+  public Map<String, Object> asPatch() {
+    return GsonSingleton.getGson().fromJson(this.toString(), Map.class);
+  }
+
+}
+

modules/vpc/src/main/java/com/ibm/cloud/is/vpc/v1/model/AddressPrefixPatch.java

@@ -21,23 +21,23 @@ public class CreateInstanceVolumeAttachmentOptions extends GenericModel {
 
   protected String instanceId;
   protected VolumeIdentity volume;
-  protected String name;
   protected Boolean deleteVolumeOnInstanceDelete;
+  protected String name;
 
   /**
    * Builder.
    */
   public static class Builder {
     private String instanceId;
     private VolumeIdentity volume;
-    private String name;
     private Boolean deleteVolumeOnInstanceDelete;
+    private String name;
 
     private Builder(CreateInstanceVolumeAttachmentOptions createInstanceVolumeAttachmentOptions) {
       this.instanceId = createInstanceVolumeAttachmentOptions.instanceId;
       this.volume = createInstanceVolumeAttachmentOptions.volume;
-      this.name = createInstanceVolumeAttachmentOptions.name;
       this.deleteVolumeOnInstanceDelete = createInstanceVolumeAttachmentOptions.deleteVolumeOnInstanceDelete;
+      this.name = createInstanceVolumeAttachmentOptions.name;
     }
 
     /**
@@ -89,24 +89,24 @@ public Builder volume(VolumeIdentity volume) {
     }
 
     /**
-     * Set the name.
+     * Set the deleteVolumeOnInstanceDelete.
      *
-     * @param name the name
+     * @param deleteVolumeOnInstanceDelete the deleteVolumeOnInstanceDelete
      * @return the CreateInstanceVolumeAttachmentOptions builder
      */
-    public Builder name(String name) {
-      this.name = name;
+    public Builder deleteVolumeOnInstanceDelete(Boolean deleteVolumeOnInstanceDelete) {
+      this.deleteVolumeOnInstanceDelete = deleteVolumeOnInstanceDelete;
       return this;
     }
 
     /**
-     * Set the deleteVolumeOnInstanceDelete.
+     * Set the name.
      *
-     * @param deleteVolumeOnInstanceDelete the deleteVolumeOnInstanceDelete
+     * @param name the name
      * @return the CreateInstanceVolumeAttachmentOptions builder
      */
-    public Builder deleteVolumeOnInstanceDelete(Boolean deleteVolumeOnInstanceDelete) {
-      this.deleteVolumeOnInstanceDelete = deleteVolumeOnInstanceDelete;
+    public Builder name(String name) {
+      this.name = name;
       return this;
     }
   }
@@ -118,8 +118,8 @@ protected CreateInstanceVolumeAttachmentOptions(Builder builder) {
       "volume cannot be null");
     instanceId = builder.instanceId;
     volume = builder.volume;
-    name = builder.name;
     deleteVolumeOnInstanceDelete = builder.deleteVolumeOnInstanceDelete;
+    name = builder.name;
   }
 
   /**
@@ -154,26 +154,26 @@ public VolumeIdentity volume() {
   }
 
   /**
-   * Gets the name.
+   * Gets the deleteVolumeOnInstanceDelete.
    *
-   * The user-defined name for this volume attachment. If unspecified, the name will be a hyphenated list of
-   * randomly-selected words.
+   * If set to true, when deleting the instance the volume will also be deleted.
    *
-   * @return the name
+   * @return the deleteVolumeOnInstanceDelete
    */
-  public String name() {
-    return name;
+  public Boolean deleteVolumeOnInstanceDelete() {
+    return deleteVolumeOnInstanceDelete;
   }
 
   /**
-   * Gets the deleteVolumeOnInstanceDelete.
+   * Gets the name.
    *
-   * If set to true, when deleting the instance the volume will also be deleted.
+   * The user-defined name for this volume attachment. If unspecified, the name will be a hyphenated list of
+   * randomly-selected words.
    *
-   * @return the deleteVolumeOnInstanceDelete
+   * @return the name
    */
-  public Boolean deleteVolumeOnInstanceDelete() {
-    return deleteVolumeOnInstanceDelete;
+  public String name() {
+    return name;
   }
 }
 

modules/vpc/src/main/java/com/ibm/cloud/is/vpc/v1/model/CreateInstanceVolumeAttachmentOptions.java

@@ -166,7 +166,7 @@ public String vpcId() {
    *
    * The IPv4 range of the address prefix, expressed in CIDR format. The request must not overlap with any existing
    * address prefixes in the VPC, and must fall within the [RFC 1918](https://tools.ietf.org/html/rfc1918) address
-   * ranges. The prefix length of the address prefix's CIDR must be between `/8` (16,777,216 addresses) and `/29` (8
+   * ranges. The prefix length of the address prefix's CIDR must be between `/9` (8,388,608 addresses) and `/29` (8
    * addresses).
    *
    * @return the cidr