Implementation of MANAGED, MANAGED-NOVLAN, SYSTEM and STATIC in EUCANETD

EUCA-10579
Corymbia · Mar 10, 2015 · ee1b9a4 · ee1b9a4
1 parent bd4eabf
commit ee1b9a4
Show file tree

Hide file tree

Showing 117 changed files with 23,952 additions and 6,429 deletions.
diff --git a/.cproject b/.cproject
diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/VmRunType.java
@@ -146,7 +146,14 @@ public VmRunType.Builder networkNames( List<NetworkGroup> list ) {
       }
       return this;
     }
-
+
+    public VmRunType.Builder networkIds( List<NetworkGroup> list ) {
+      for ( NetworkGroup g : list ) {
+        this.buildit.getNetworkIds( ).add( g.getGroupId() );
+      }
+      return this;
+    }
+
     public VmRunType.Builder naturalId( final String naturalId ) {
       this.buildit.setUuid( naturalId );
       return this;
@@ -168,6 +175,7 @@ public VmRunType create( ) {
       checkParam( this.buildit.getLaunchIndex(), notNullValue() );
       checkParam( this.buildit.getMacAddress(), notNullValue() );
       checkParam( this.buildit.getNetworkNames().isEmpty(), is( false ) );
+      checkParam( this.buildit.getNetworkIds().isEmpty(), is( false ) );
       checkParam( this.buildit.getNetworkIndex(), notNullValue() );
       checkParam( this.buildit.getPlatform(), notNullValue() );
       checkParam( this.buildit.getReservationId(), notNullValue() );
@@ -213,6 +221,7 @@ public static Builder builder( ) {
   private String       uuid;
   private String       macAddress = "";
   private List<String> networkNames = new ArrayList<String>( );
+  private List<String> networkIds = new ArrayList<String>( );
   private Long         networkIndex = -1l;
   private String       privateAddress;
 
@@ -221,13 +230,14 @@ public static Builder builder( ) {
   private VmRunType( final String reservationId, final String userData, final int amount,
                      final VmTypeInfo vmTypeInfo, final VmKeyInfo keyInfo, final String platform,
                      final List<String> instanceIds,
-                     final int vlan, final List<String> networkNames, final List<String> networkIndexList, final List<String> uuids ) {
+                     final int vlan, final List<String> networkNames, final List<String> networkIds, final List<String> networkIndexList, final List<String> uuids ) {
     this.reservationId = reservationId;
     this.userData = userData;
     this.vlan = vlan;
     this.vmTypeInfo = vmTypeInfo;
     this.keyInfo = keyInfo;
     this.networkNames = networkNames;
+    this.networkIds = networkIds;
     this.platform = platform;
   }
 
@@ -281,7 +291,11 @@ void setKeyInfo( final VmKeyInfo keyInfo ) {
   void setNetworkNames( final List<String> networkNames ) {
     this.networkNames = networkNames;
   }
-
+
+  void setNetworkIds( final List<String> networkIds ) {
+        this.networkIds = networkIds;
+    }
+
   void setInstanceId( final String instanceId ) {
     this.instanceId = instanceId;
   }
@@ -351,7 +365,11 @@ public String getInstanceId( ) {
   public List<String> getNetworkNames( ) {
     return this.networkNames;
   }
-
+
+  public List<String> getNetworkIds( ) {
+        return this.networkIds;
+    }
+
   public Long getNetworkIndex( ) {
     return this.networkIndex;
   }

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cloud/run/ClusterAllocator.java
@@ -716,6 +716,7 @@ private VmRunCallback makeRunCallback( final ResourceToken childToken, final VmT
                                    .keyInfo( vmKeyInfo )
                                    .launchIndex( childToken.getLaunchIndex( ) )
                                    .networkNames( this.allocInfo.getNetworkGroups( ) )
+                                   .networkIds( this.allocInfo.getNetworkGroups( ) )
                                    .platform( platform )
                                    .reservationId( childToken.getAllocationInfo( ).getReservationId( ) )
                                    .userData( this.allocInfo.getRequest( ).getUserData( ) )

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkInfo.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/NetworkInfo.groovy
@@ -53,6 +53,7 @@ class NIConfiguration {
   @XmlElement(name="property") List<NIProperty> properties = Lists.newArrayList()
   @XmlElement(name="property") NIMidonet midonet
   @XmlElement(name="property") NISubnets subnets
+  @XmlElement(name="property") NIManagedSubnets managedSubnet
   @XmlElement(name="property") NIClusters clusters
 }
 
@@ -88,6 +89,22 @@ class NISubnet {
   @XmlElement(name="property") List<NIProperty> properties = Lists.newArrayList()
 }
 
+@Canonical
+@CompileStatic
+@XmlAccessorType( XmlAccessType.NONE )
+class NIManagedSubnets {
+  @XmlAttribute String name
+  @XmlElement(name="managedSubnet") NIManagedSubnet managedSubnet
+}
+
+@Canonical
+@CompileStatic
+@XmlAccessorType( XmlAccessType.NONE )
+class NIManagedSubnet {
+  @XmlAttribute String name
+  @XmlElement(name="property") List<NIProperty> properties = Lists.newArrayList()
+}
+
 @Canonical
 @CompileStatic
 @XmlAccessorType( XmlAccessType.NONE )

diff --git a/...s/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/NetworkStateCallback.java b/...s/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/NetworkStateCallback.java
@@ -71,7 +71,7 @@
 import com.eucalyptus.compute.common.network.NetworkResourceReportType;
 import com.eucalyptus.compute.common.network.Networking;
 import com.eucalyptus.compute.common.network.UpdateNetworkResourcesType;
-import com.eucalyptus.network.EdgeNetworking;
+import com.eucalyptus.network.NetworkingDriver;
 import com.eucalyptus.util.Internets;
 import com.eucalyptus.util.TypeMapper;
 import com.eucalyptus.util.TypeMappers;
@@ -105,7 +105,7 @@ public NetworkStateCallback( ) {
    */
   @Override
   public void fire( final DescribeNetworksResponseType reply ) {
-    EdgeNetworking.setReported( "EDGE".equals( reply.getMode( ) ) );
+    NetworkingDriver.setReported( reply.getMode( ) );
     UpdateNetworkResourcesType update = new UpdateNetworkResourcesType( );
     update.setCluster( this.getSubject( ).getName( ) );
     update.setResources( TypeMappers.transform( reply, NetworkResourceReportType.class ) );

diff --git a/...s/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartNetworkCallback.java b/...s/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/StartNetworkCallback.java
@@ -88,6 +88,7 @@ public StartNetworkCallback( final ExtantNetwork extantNet ) {
                                                  extantNet.getOwnerUserId( ),
                                                  extantNet.getTag( ),
                                                  extantNet.getNetworkGroup( ).getNaturalId( ),
+                                                 extantNet.getNetworkGroup().getGroupId(),
                                                  extantNet.getNetworkGroup( ).getNaturalId( ) );
     msg.setUserId( this.extantNet.getOwnerUserId( ) );
     msg.setAccountId( this.extantNet.getOwnerAccountNumber( ) );

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/cluster/callback/VmRunCallback.java
@@ -77,7 +77,7 @@
 import com.eucalyptus.compute.common.backend.RunInstancesType;
 import com.eucalyptus.compute.common.network.PublicIPResource;
 import com.eucalyptus.entities.Entities;
-import com.eucalyptus.network.EdgeNetworking;
+import com.eucalyptus.network.NetworkingDriver;
 import com.eucalyptus.records.Logs;
 import com.eucalyptus.system.tracking.MessageContexts;
 import com.eucalyptus.util.Callback;
@@ -163,7 +163,7 @@ public void fire( final VmRunResponseType reply ) {
       @Override
       public Boolean apply( final VmInfo input ) {
         final VmInstance vm = VmInstances.lookup( input.getInstanceId( ) );
-        if ( !EdgeNetworking.isEnabled( ) ) {
+        if ( !NetworkingDriver.isEnabled( ) ) {
           vm.updateAddresses( input.getNetParams( ).getIpAddress( ), input.getNetParams( ).getIgnoredPublicIp( ) );
         }
         try {

diff --git a/...luster-manager/src/main/java/com/eucalyptus/compute/vpc/VpcInvalidationEventListener.java b/...luster-manager/src/main/java/com/eucalyptus/compute/vpc/VpcInvalidationEventListener.java
@@ -21,7 +21,7 @@
 
 import com.eucalyptus.event.EventListener;
 import com.eucalyptus.event.Listeners;
-import com.eucalyptus.network.EdgeNetworking;
+import com.eucalyptus.network.NetworkingDriver;
 import com.eucalyptus.network.NetworkInfoBroadcaster;
 
 /**
@@ -35,7 +35,7 @@ public static void register( ) {
 
   @Override
   public void fireEvent( final VpcInvalidationEvent event ) {
-    if ( EdgeNetworking.isEnabled( ) ) {
+    if ( NetworkingDriver.isEnabled( ) ) {
       NetworkInfoBroadcaster.requestNetworkInfoBroadcast( );
     }
   }

diff --git a/.../cluster-manager/src/main/java/com/eucalyptus/network/DispatchingNetworkingService.groovy b/.../cluster-manager/src/main/java/com/eucalyptus/network/DispatchingNetworkingService.groovy
@@ -53,9 +53,14 @@ class DispatchingNetworkingService {
       LockResource.withLock( delegateLock.writeLock( ) ) {
         if ( delegateNeedsUpdatingFor( networkService ) ) {
           networkingServiceDelegateName = networkService
-          networkingServiceDelegate = poolInvoked( 'EDGE' == networkService ?
-              new EdgeNetworkingService( ) :
-              new GenericNetworkingService( ) )
+          if ('EDGE' == networkService) {
+            networkingServiceDelegate = poolInvoked(new EdgeNetworkingService())
+          } else if (('MANAGED' == networkService) || ('MANAGED-NOVLAN' == networkService)) {
+            networkingServiceDelegate = poolInvoked(new ManagedNetworkingService())
+          } else {
+            // TODO: Need to figure out why we hit this case...
+            networkingServiceDelegate = poolInvoked(new ManagedNetworkingService())
+          }
         }
         void
       }

diff --git a/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/EdgeNetworking.groovy b/clc/modules/cluster-manager/src/main/java/com/eucalyptus/network/EdgeNetworking.groovy