Merge pull request #1133 from Grim-lock/bugfix

add vip_network_id and vip_port_id for lb post
ContainX · Jan 22, 2018 · 7a45d4a · 7a45d4a
2 parents bcf3a13 + 81b651a
commit 7a45d4a
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 1 deletion.
diff --git a/core/src/main/java/org/openstack4j/model/octavia/LoadBalancerV2.java b/core/src/main/java/org/openstack4j/model/octavia/LoadBalancerV2.java
@@ -32,6 +32,11 @@ public interface LoadBalancerV2  extends ModelEntity, Buildable<LoadBalancerV2Bu
      */
     String getDescription();
 
+    /**
+     * @return The vip network id of the loadbalancer.
+     */
+    String getVipNetworkId();
+
     /**
      * @return The vip subnet id of the loadbalancer.
      */

diff --git a/core/src/main/java/org/openstack4j/model/octavia/builder/LoadBalancerV2Builder.java b/core/src/main/java/org/openstack4j/model/octavia/builder/LoadBalancerV2Builder.java
@@ -32,13 +32,32 @@ public interface LoadBalancerV2Builder extends Buildable.Builder<LoadBalancerV2B
     /**
      * Optional
      *
-     * @param vipSubnetId
+     * @param vipNetworkId
      *            The network on which to allocate the load balancer's vip address.
      *            A tenant can only create load balancer vips on networks authorized by policy (e.g. her own networks or shared/provider networks).
      * @return LoadBalancerV2Builder
      */
+    LoadBalancerV2Builder networkId(String vipNetworkId);
+
+    /**
+     * Optional
+     *
+     * @param vipSubnetId
+     *            The subnet on which to allocate the load balancer's vip address.
+     *            A tenant can only create load balancer vips on subnets authorized by policy.
+     * @return LoadBalancerV2Builder
+     */
     LoadBalancerV2Builder subnetId(String vipSubnetId);
 
+    /**
+     * Optional
+     *
+     * @param vipPortId
+     *            The vip port.
+     * @return LoadBalancerV2Builder
+     */
+    LoadBalancerV2Builder portId(String vipPortId);
+
     /**
      * Optional
      *

diff --git a/core/src/main/java/org/openstack4j/openstack/octavia/domain/OctaviaLoadBalancerV2.java b/core/src/main/java/org/openstack4j/openstack/octavia/domain/OctaviaLoadBalancerV2.java
@@ -29,6 +29,12 @@ public class OctaviaLoadBalancerV2 implements LoadBalancerV2 {
 
     private String description;
 
+    /**
+     * The ID of the network on which to allocate the VIP address.
+     */
+    @JsonProperty("vip_network_id")
+    private String vipNetworkId;
+
     /**
      * The ID of the subnet on which to allocate the VIP address.
      */
@@ -89,6 +95,15 @@ public String getDescription(){
         return description;
     }
 
+    /**
+     * {@inheritDoc}
+     */
+    @JsonProperty("vip_network_id")
+    @Override
+    public String getVipNetworkId(){
+        return vipNetworkId;
+    }
+
     /**
      * {@inheritDoc}
      */
@@ -169,6 +184,7 @@ public String toString(){
                 .add("projectId", projectId)
                 .add("name", name)
                 .add("description", description)
+                .add("vipNetworkId", vipNetworkId)
                 .add("vipSubnetId", vipSubnetId)
                 .add("vipAddress", vipAddress)
                 .add("adminStateUp", adminStateUp)
@@ -253,6 +269,15 @@ public LoadBalancerV2Builder description(String description){
             return this;
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public LoadBalancerV2Builder networkId(String vipNetworkId){
+            m.vipNetworkId = vipNetworkId;
+            return this;
+        }
+
         /**
          * {@inheritDoc}
          */
@@ -262,6 +287,15 @@ public LoadBalancerV2Builder subnetId(String vipSubnetId){
             return this;
         }
 
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public LoadBalancerV2Builder portId(String vipPortId){
+            m.vipPortId = vipPortId;
+            return this;
+        }
+
         /**
          * {@inheritDoc}
          */