Merge branch 'dev'

subutai-attic · Feb 22, 2017 · 416b52f · 416b52f
2 parents 39923a8 + 3715562
commit 416b52f
Show file tree

Hide file tree

Showing 96 changed files with 2,136 additions and 1,447 deletions.
diff --git a/accumulo/webui/src/main/webapp/partials/manage.html b/accumulo/webui/src/main/webapp/partials/manage.html
@@ -54,12 +54,11 @@ <h2 class="b-workspace-content-row-h2 b-workspace-content-row-h2_inline">
         <tr ng-if="accumuloCtrl.currentCluster.master">
           <td>{{ accumuloCtrl.currentCluster.master.hostname }}</td>
           <td>{{ accumuloCtrl.currentCluster.master.ip }}</td>
-          <td class="b-main-table__container-status">
-            <div
-                tooltips
-                tooltip-title="{{ accumuloCtrl.currentCluster.master.status }}"
-                class="b-status-icon b-status-icon_{{ accumuloCtrl.currentCluster.master.status }}"
-            >
+          <td>
+            <div class="b-status-icon b-status-icon_{{ accumuloCtrl.currentCluster.master.status }}"
+                 tooltips
+                 tooltip-template="{{ accumuloCtrl.currentCluster.master.status }}"
+                 tooltip-side="right">
             </div>
           </td>
           <td class="b-main-table__empty-item">
@@ -148,12 +147,11 @@ <h2 class="b-workspace-content-row-h2 b-workspace-content-row-h2_inline">
           </td>
           <td>{{ clusterNode.hostname }}</td>
           <td>{{ clusterNode.ip }}</td>
-          <td class="b-main-table__container-status">
-            <div
-                tooltips
-                tooltip-title="{{ clusterNode.status }}"
-                class="b-status-icon b-status-icon_{{ clusterNode.status }}"
-                title="{{ clusterNode.status }}">
+          <td>
+            <div class="b-status-icon b-status-icon_{{ clusterNode.status }}"
+                 tooltips
+                 tooltip-template="{{ clusterNode.status }}"
+                 tooltip-side="right">
             </div>
           </td>
           <td>

diff --git a/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/Allocator.java b/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/Allocator.java
@@ -6,8 +6,8 @@
 import java.util.Collections;
 import java.util.List;
 
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.hub.share.quota.ContainerQuota;
+import io.subutai.hub.share.quota.ContainerSize;
 import io.subutai.hub.share.resource.HostResources;
 import io.subutai.hub.share.resource.PeerResources;
 

diff --git a/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppScaleImpl.java b/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppScaleImpl.java
@@ -30,7 +30,6 @@
 import io.subutai.common.tracker.TrackerOperation;
 import io.subutai.core.environment.api.EnvironmentEventListener;
 import io.subutai.core.environment.api.EnvironmentManager;
-import io.subutai.core.lxc.quota.api.QuotaManager;
 import io.subutai.core.metric.api.Monitor;
 import io.subutai.core.network.api.NetworkManager;
 import io.subutai.core.peer.api.PeerManager;
@@ -54,7 +53,6 @@ public class AppScaleImpl implements AppScaleInterface, EnvironmentEventListener
     private Tracker tracker;
     private EnvironmentManager environmentManager;
     private NetworkManager networkManager;
-    private QuotaManager quotaManager;
     private PeerManager peerManager;
     private Environment environment;
     private AppScaleConfig appScaleConfig;
@@ -118,7 +116,8 @@ public List<String> getClusterList( Environment name )
     {
         List<String> c = new ArrayList();
         Set<EnvironmentContainerHost> containerHosts = name.getContainerHosts();
-        containerHosts.stream().forEach( ( ech ) -> {
+        containerHosts.stream().forEach( ( ech ) ->
+        {
             c.add( ech.toString() );
         } );
         return c;
@@ -303,18 +302,6 @@ public void setNetworkManager( NetworkManager networkManager )
     }
 
 
-    public QuotaManager getQuotaManager()
-    {
-        return quotaManager;
-    }
-
-
-    public void setQuotaManager( QuotaManager quotaManager )
-    {
-        this.quotaManager = quotaManager;
-    }
-
-
     public PeerManager getPeerManager()
     {
         return peerManager;

diff --git a/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppScaleWebModule.java b/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppScaleWebModule.java
@@ -6,7 +6,6 @@
 
 import com.google.gson.Gson;
 
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.webui.api.WebuiModule;
 import io.subutai.webui.entity.AngularjsDependency;
 import io.subutai.webui.entity.WebuiModuleResourse;

diff --git a/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppscalePlacementStrategy.java b/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/AppscalePlacementStrategy.java
@@ -14,11 +14,11 @@
 import io.subutai.common.environment.Node;
 import io.subutai.common.environment.NodeSchema;
 import io.subutai.common.environment.Topology;
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.core.plugincommon.api.PluginDAO;
 import io.subutai.core.strategy.api.ContainerPlacementStrategy;
 import io.subutai.core.strategy.api.StrategyException;
 import io.subutai.hub.share.quota.ContainerQuota;
+import io.subutai.hub.share.quota.ContainerSize;
 import io.subutai.hub.share.resource.PeerGroupResources;
 import io.subutai.hub.share.resource.PeerResources;
 
@@ -106,9 +106,9 @@ protected Set<Node> distribute( List<NodeSchema> nodeSchemas, PeerGroupResources
             while ( counter < allocators.size() )
             {
                 final Allocator resourceAllocator = iterator.next();
-                allocated = resourceAllocator
-                        .allocate( containerName, nodeSchema.getTemplateName(), nodeSchema.getSize(),
-                                quotas.get( nodeSchema.getSize() ) );
+                allocated = resourceAllocator.allocate( containerName, nodeSchema.getTemplateName(),
+                        nodeSchema.getQuota().getContainerSize(),
+                        quotas.get( nodeSchema.getQuota().getContainerSize() ) );
                 if ( allocated )
                 {
                     break;

diff --git a/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/ClusterConfiguration.java b/appscale/impl/src/main/java/io/subutai/plugin/appscale/impl/ClusterConfiguration.java
@@ -17,7 +17,6 @@
 import io.subutai.common.command.RequestBuilder;
 import io.subutai.common.environment.ContainerHostNotFoundException;
 import io.subutai.common.environment.Environment;
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.common.peer.EnvironmentContainerHost;
 import io.subutai.common.peer.LocalPeer;
 import io.subutai.common.peer.PeerException;
@@ -28,6 +27,7 @@
 import io.subutai.core.plugincommon.api.ClusterConfigurationException;
 import io.subutai.core.plugincommon.api.ClusterConfigurationInterface;
 import io.subutai.core.plugincommon.api.ConfigBase;
+import io.subutai.hub.share.quota.ContainerSize;
 import io.subutai.plugin.appscale.api.AppScaleConfig;
 
 import static java.lang.String.format;

diff --git a/...cale/impl/src/main/java/io/subutai/plugin/appscale/impl/handler/AppscaleAlertHandler.java b/...cale/impl/src/main/java/io/subutai/plugin/appscale/impl/handler/AppscaleAlertHandler.java
@@ -2,40 +2,30 @@
 
 
 import java.math.BigDecimal;
-import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CopyOnWriteArraySet;
 
-import javax.security.auth.Subject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.subutai.common.environment.Environment;
-import io.subutai.common.environment.NodeSchema;
-import io.subutai.common.environment.Topology;
 import io.subutai.common.metric.ExceededQuota;
 import io.subutai.common.metric.QuotaAlertValue;
 import io.subutai.common.peer.AlertHandlerException;
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.common.peer.EnvironmentContainerHost;
 import io.subutai.common.peer.ExceededQuotaAlertHandler;
 import io.subutai.hub.share.quota.ContainerOptResource;
-import io.subutai.hub.share.quota.ContainerQuota;
 import io.subutai.hub.share.resource.ByteValueResource;
 import io.subutai.hub.share.resource.ContainerResourceType;
 import io.subutai.hub.share.resource.PeerGroupResources;
 import io.subutai.hub.share.resource.PeerResources;
-import io.subutai.core.identity.api.model.Session;
 import io.subutai.plugin.appscale.api.AppScaleConfig;
 import io.subutai.plugin.appscale.impl.AppScaleImpl;
-import io.subutai.plugin.appscale.impl.AppscalePlacementStrategy;
 
 
 /**
@@ -141,7 +131,6 @@ public void process( final Environment environment, final QuotaAlertValue alertV
             lock ( environment.getId () );
 
             final PeerGroupResources peerGroupResources = appScale.getPeerManager ().getPeerGroupResources ();
-            final Map<ContainerSize, ContainerQuota> quotas = appScale.getQuotaManager ().getDefaultQuotas ();
 
             final List<PeerResources> resources = new ArrayList<> ();
             final List<String> preferredPeerList = getPreferredPeers ( environment, peerGroupResources );

diff --git a/appscale/impl/src/main/resources/OSGI-INF/blueprint/context.xml b/appscale/impl/src/main/resources/OSGI-INF/blueprint/context.xml
@@ -9,8 +9,6 @@
     <property name="networkManager" ref="networkManager" />
     <property name="environmentManager" ref="environmentManager" />
     <property name="peerManager" ref="peerManager" />
-    <property name="quotaManager" ref="quotaManager" />
-
   </bean>
 
   <reference id="tracker" availability="mandatory"
@@ -21,8 +19,6 @@
              interface="io.subutai.core.environment.api.EnvironmentManager" />
   <reference id="peerManager" availability="mandatory"
              interface="io.subutai.core.peer.api.PeerManager" />
-  <reference id="quotaManager" availability="mandatory"
-             interface="io.subutai.core.lxc.quota.api.QuotaManager" />
   <reference id="identityManager" availability="mandatory"
              interface="io.subutai.core.identity.api.IdentityManager" />
   <reference id="monitor" availability="mandatory"

diff --git a/cassandra/api/src/main/java/io/subutai/plugin/cassandra/api/CassandraClusterConfig.java b/cassandra/api/src/main/java/io/subutai/plugin/cassandra/api/CassandraClusterConfig.java
@@ -1,14 +1,12 @@
 package io.subutai.plugin.cassandra.api;
 
 
+import java.util.HashSet;
 import java.util.Set;
 
-import com.google.common.collect.Sets;
-
-import io.subutai.common.peer.ContainerSize;
 import io.subutai.common.settings.Common;
-import io.subutai.common.util.CollectionUtil;
 import io.subutai.core.plugincommon.api.ConfigBase;
+import io.subutai.hub.share.quota.ContainerSize;
 
 
 public class CassandraClusterConfig implements ConfigBase
@@ -22,7 +20,7 @@ public class CassandraClusterConfig implements ConfigBase
     private String clusterName = "";
     private String domainName = Common.DEFAULT_DOMAIN_NAME;
     private int numberOfSeeds;
-    private Set<String> seedNodes;
+    private Set<String> seedNodes = new HashSet<>();
     private String dataDirectory = "/var/lib/cassandra/data";
     private String commitLogDirectory = "/var/lib/cassandra/commitlog";
     private String savedCachesDirectory = "/var/lib/cassandra/saved_caches";
@@ -159,6 +157,16 @@ public void setSeedNodes( Set<String> seedNodes )
     }
 
 
+    public void addSeedNode( final String seedIp )
+    {
+        if ( this.seedNodes == null )
+        {
+            this.seedNodes = new HashSet<>();
+        }
+        this.seedNodes.add( seedIp );
+    }
+
+
     public String getDomainName()
     {
         return domainName;
@@ -174,13 +182,9 @@ public void setDomainName( String domainName )
     @Override
     public String toString()
     {
-        return "Config{" +
-                "clusterName='" + clusterName + '\'' +
-                ", domainName='" + domainName + '\'' +
-                ", numberOfSeeds=" + numberOfSeeds +
-                ", dataDirectory='" + dataDirectory + '\'' +
-                ", commitLogDirectory='" + commitLogDirectory + '\'' +
-                ", savedCachesDirectory='" + savedCachesDirectory + '\'' +
-                '}';
+        return "Config{" + "clusterName='" + clusterName + '\'' + ", domainName='" + domainName + '\''
+                + ", numberOfSeeds=" + numberOfSeeds + ", dataDirectory='" + dataDirectory + '\''
+                + ", commitLogDirectory='" + commitLogDirectory + '\'' + ", savedCachesDirectory='"
+                + savedCachesDirectory + '\'' + '}';
     }
 }
diff --git a/cassandra/impl/src/main/java/io/subutai/plugin/cassandra/impl/CassandraImpl.java b/cassandra/impl/src/main/java/io/subutai/plugin/cassandra/impl/CassandraImpl.java
@@ -19,7 +19,6 @@
 import io.subutai.common.util.CollectionUtil;
 import io.subutai.core.environment.api.EnvironmentEventListener;
 import io.subutai.core.environment.api.EnvironmentManager;
-import io.subutai.core.lxc.quota.api.QuotaManager;
 import io.subutai.core.metric.api.Monitor;
 import io.subutai.core.metric.api.MonitoringSettings;
 import io.subutai.core.peer.api.PeerManager;
@@ -47,7 +46,6 @@ public class CassandraImpl implements Cassandra, EnvironmentEventListener
     private EnvironmentManager environmentManager;
     private PluginDAO pluginDAO;
     private PeerManager peerManager;
-    private QuotaManager quotaManager;
     private StrategyManager strategyManager;
     private Monitor monitor;
     private TemplateManager templateManager;
@@ -437,18 +435,6 @@ public void setStrategyManager( final StrategyManager strategyManager )
     }
 
 
-    public QuotaManager getQuotaManager()
-    {
-        return quotaManager;
-    }
-
-
-    public void setQuotaManager( final QuotaManager quotaManager )
-    {
-        this.quotaManager = quotaManager;
-    }
-
-
     public void setTemplateManager( final TemplateManager templateManager )
     {
         this.templateManager = templateManager;

diff --git a/cassandra/impl/src/main/java/io/subutai/plugin/cassandra/impl/CassandraWebModule.java b/cassandra/impl/src/main/java/io/subutai/plugin/cassandra/impl/CassandraWebModule.java
@@ -16,7 +16,7 @@ public class CassandraWebModule implements WebuiModule
 {
     private static String NAME = "Cassandra";
     private static String IMG = "plugins/cassandra/cassandra.png";
-    private static final String SIZE = "MEDIUM";
+    private static final String SIZE = "HUGE";
 
     private static final Map<String, Integer> TEMPLATES_REQUIREMENT;