You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/08/15 06:33:50 UTC

git commit: Added missed vxlan network type and JavaDoc

Repository: jclouds-labs-openstack
Updated Branches:
  refs/heads/master 242e5bcd0 -> d9c238029


Added missed vxlan network type and JavaDoc


Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/d9c23802
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/d9c23802
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/d9c23802

Branch: refs/heads/master
Commit: d9c238029908b355906b441bf89499ad2fcea02c
Parents: 242e5bc
Author: Tarasenko Evgeny <et...@xored.com>
Authored: Thu Aug 14 16:22:28 2014 +0700
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Aug 14 23:32:43 2014 -0500

----------------------------------------------------------------------
 .../openstack/neutron/v2/domain/NetworkType.java   | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/d9c23802/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java
index 5281cdf..950138a 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkType.java
@@ -18,7 +18,10 @@
 package org.jclouds.openstack.neutron.v2.domain;
 
 /**
- * Enumerates supported Network types.
+ * Enumerates supported Network types. 
+ * 
+ * @see <a href=
+ *      "http://docs.openstack.org/api/openstack-network/2.0/content/provider_ext.html">api doc</a>
  */
 public enum NetworkType {
    /**
@@ -33,6 +36,18 @@ public enum NetworkType {
     * Used to describe a VLAN network. NetworkSegment might have to be set.
     */
    VLAN("vlan"),
+   /**
+    * Used to describe a Virtual Extensible LAN (VXLAN) network. 
+    * It uses a VLAN-like encapsulation technique to encapsulate MAC-based 
+    * OSI layer 2 Ethernet frames within layer 4 UDP packets.
+    */
+   VXLAN("vxlan"),
+   /**
+    * Used to describe a GRE tunnel network. A virtual network realized as 
+    * packets encapsulated using Generic Routing Encapsulation. GRE tunnel 
+    * packets are routed by the compute node hosts, so GRE tunnels are not 
+    * associated by the openvswitch plugin with specific physical networks.
+    */
    GRE("gre"),
    /**
     * Used by jclouds when the service returns an unknown value other than null.