ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [26/50] [abbrv] incubator-ignite git commit: # ignite-301
Date Fri, 20 Feb 2015 08:43:43 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 0ea8def..b1b0275 100644
--- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -24,16 +24,15 @@ import org.apache.ignite.configuration.*;
 import org.apache.ignite.igfs.*;
 import org.apache.ignite.igfs.mapreduce.*;
 import org.apache.ignite.internal.*;
+import org.apache.ignite.internal.cluster.*;
 import org.apache.ignite.internal.processors.cache.*;
 import org.apache.ignite.internal.processors.igfs.*;
 import org.apache.ignite.internal.processors.hadoop.planner.*;
-import org.apache.ignite.internal.util.lang.*;
 import org.apache.ignite.internal.util.typedef.*;
 import org.apache.ignite.lang.*;
 import org.apache.ignite.testframework.*;
 import org.jetbrains.annotations.*;
 
-import java.io.*;
 import java.net.*;
 import java.util.*;
 
@@ -925,6 +924,11 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
     @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor")
     private static class MockIgnite extends IgniteSpringBean implements IgniteEx {
         /** {@inheritDoc} */
+        @Override public IgniteClusterEx cluster() {
+            return (IgniteClusterEx)super.cluster();
+        }
+
+        /** {@inheritDoc} */
         @Override public IgniteFs igfsx(String name) {
             assert F.eq("igfs", name);
 
@@ -989,230 +993,11 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public ClusterGroupEx forSubjectId(UUID subjId) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
         @Override public ClusterNode localNode() {
             return null;
         }
 
         /** {@inheritDoc} */
-        @Override public ClusterGroup forLocal() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public <K, V> ClusterNodeLocalMap<K, V> nodeLocalMap() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean pingNode(UUID nodeId) {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override public long topologyVersion() {
-            return 0;
-        }
-
-        /** {@inheritDoc} */
-        @Nullable @Override public Collection<ClusterNode> topology(long topVer) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public <K> Map<ClusterNode, Collection<K>> mapKeysToNodes(@Nullable String cacheName,
-            @Nullable Collection<? extends K> keys) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Nullable @Override public <K> ClusterNode mapKeyToNode(@Nullable String cacheName, K key) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(File file,
-            boolean restart, int timeout, int maxConn) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Collection<GridTuple3<String, Boolean, String>> startNodes(
-            Collection<Map<String, Object>> hosts, @Nullable Map<String, Object> dflts, boolean restart, int timeout,
-            int maxConn) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public void stopNodes() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public void stopNodes(Collection<UUID> ids) {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public void restartNodes() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public void restartNodes(Collection<UUID> ids) {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public void resetMetrics() {
-            // No-op.
-        }
-
-        /** {@inheritDoc} */
-        @Override public Ignite ignite() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forNodes(Collection<? extends ClusterNode> nodes) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forNode(ClusterNode node, ClusterNode... nodes) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forOthers(ClusterNode node, ClusterNode... nodes) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forOthers(ClusterGroup prj) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forNodeIds(Collection<UUID> ids) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forNodeId(UUID id, UUID... ids) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forPredicate(IgnitePredicate<ClusterNode> p) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forAttribute(String name, @Nullable String val) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forCacheNodes(String cacheName) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forDataNodes(String cacheName) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forClientNodes(String cacheName) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forStreamer(String streamerName, @Nullable String... streamerNames) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forRemotes() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forHost(ClusterNode node) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forDaemons() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forRandom() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forOldest() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forYoungest() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public Collection<ClusterNode> nodes() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Nullable @Override public ClusterNode node(UUID nid) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Nullable @Override public ClusterNode node() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public IgnitePredicate<ClusterNode> predicate() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterMetrics metrics() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public IgniteCluster withAsync() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public boolean isAsync() {
-            return false;
-        }
-
-        /** {@inheritDoc} */
-        @Override public <R> IgniteFuture<R> future() {
-            return null;
-        }
-
-        /** {@inheritDoc} */
-        @Override public ClusterGroup forCacheNodes(@Nullable String cacheName, Set<CacheDistributionMode> distributionModes) {
-            return null;
-        }
-
-        /** {@inheritDoc} */
         @Override public String latestVersion() {
             return null;
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 512e914..37b5c08 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@ -680,7 +680,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
     public void testQueryIntegersWithJoin() throws Exception {
         CacheQuery<List<?>> qry = ((GridCacheQueriesEx<?, ?>)((IgniteKernal)grid(0)).cache(null).queries()).createSqlFieldsQuery(
             "select i._KEY, i._VAL, j._KEY, j._VAL from Integer i join Integer j where i._VAL >= 100", true)
-            .projection(grid(0));
+            .projection(grid(0).cluster());
 
         CacheQueryFuture<List<?>> fut = qry.execute();
 
@@ -773,7 +773,8 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
         for (int i = 0; i < 200; i++)
             assert cache.putx(i, i);
 
-        CacheQuery<List<?>> qry = cache.queries().createSqlFieldsQuery("select * from Integer").projection(grid(0));
+        CacheQuery<List<?>> qry =
+            cache.queries().createSqlFieldsQuery("select * from Integer").projection(grid(0).cluster());
 
         Collection<List<?>> res = qry.execute().get();
 
@@ -907,7 +908,7 @@ public abstract class GridCacheAbstractFieldsQuerySelfTest extends GridCommonAbs
     private void testPaginationIterator(@Nullable String cacheName) throws Exception {
         CacheQuery<List<?>> q = ((IgniteKernal)grid(0)).cache(cacheName).queries().createSqlFieldsQuery("select _key, _val from " +
             "Integer")
-            .projection(grid(0));
+            .projection(grid(0).cluster());
 
         q.pageSize(10);
         q.keepAll(false);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
index 43dd7ac..82f200c 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMetricsSelfTest.java
@@ -89,7 +89,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest {
         GridCache<String, Integer> cache = cache(0);
 
         CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0")
-            .projection(grid(0));
+            .projection(grid(0).cluster());
 
         // Execute query.
         qry.execute().get();
@@ -131,7 +131,7 @@ public class GridCacheQueryMetricsSelfTest extends GridCommonAbstractTest {
         GridCache<String, Integer> cache = cache(0);
 
         CacheQuery<Map.Entry<String, Integer>> qry = cache.queries().createSqlQuery(Integer.class, "_val >= 0")
-            .projection(grid(0));
+            .projection(grid(0).cluster());
 
         // Execute.
         qry.execute().get();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
index 83f297e..4c2f588 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
@@ -65,7 +65,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel
         assertEquals(4, cache0.size());
 
         CacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class,
-            "salary < 2000").projection(grid(0).forLocal());
+            "salary < 2000").projection(grid(0).cluster().forLocal());
 
         // Include backup entries.
         qry.includeBackups(true);
@@ -143,7 +143,7 @@ public class GridCachePartitionedQuerySelfTest extends GridCacheAbstractQuerySel
 
         assertEquals(4, cache0.size());
 
-        assert grid(0).nodes().size() == gridCount();
+        assert grid(0).cluster().nodes().size() == gridCount();
 
         CacheQuery<Map.Entry<UUID, Person>> qry = cache0.queries().createSqlQuery(Person.class,
             "salary < 2000");

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
index 880f3c9..09e9c79 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
@@ -127,7 +127,7 @@ public class GridCacheReplicatedFieldsQuerySelfTest extends GridCacheAbstractFie
 
         for (int i = 0; i < cache.configuration().getMaximumQueryIteratorCount() + 1; i++) {
             CacheQuery<List<?>> q = cache.queries().createSqlFieldsQuery(
-                "select _key from Integer where _key >= 0 order by _key").projection(grid(0));
+                "select _key from Integer where _key >= 0 order by _key").projection(grid(0).cluster());
 
             q.pageSize(50);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index b1bc036..66a43c2 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -105,7 +105,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTask() throws Exception {
-        ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), Task.class, null);
+        ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).cluster().forRemotes()), Task.class, null);
 
         testMessageSet(fut);
     }
@@ -114,7 +114,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
      * @throws Exception If failed.
      */
     public void testTaskException() throws Exception {
-        ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), FailTask.class, null);
+        ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).cluster().forRemotes()), FailTask.class, null);
 
         testMessageSet(fut);
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
index 6467448..6ffb0c6 100644
--- a/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
+++ b/modules/spring/src/test/java/org/apache/ignite/internal/processors/resource/GridServiceInjectionSelfTest.java
@@ -48,8 +48,8 @@ public class GridServiceInjectionSelfTest extends GridCommonAbstractTest impleme
         grid(0).services().deployNodeSingleton(SERVICE_NAME1, new DummyServiceImpl());
         grid(0).services(grid(0).cluster().forLocal()).deployClusterSingleton(SERVICE_NAME2, new DummyServiceImpl());
 
-        assertEquals(2, grid(0).nodes().size());
-        assertEquals(2, grid(1).nodes().size());
+        assertEquals(2, grid(0).cluster().nodes().size());
+        assertEquals(2, grid(1).cluster().nodes().size());
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
index be62eba..760edde 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ack/VisorAckCommand.scala
@@ -105,9 +105,9 @@ class VisorAckCommand {
             adviseToConnect()
         else
             try {
-                val nodeIds = ignite.nodes().map(_.id())
+                val nodeIds = ignite.cluster().nodes().map(_.id())
 
-                ignite.compute(ignite.forNodeIds(nodeIds))
+                ignite.compute(ignite.cluster().forNodeIds(nodeIds))
                     .withName("visor-ack")
                     .withNoFailover()
                     .execute(classOf[VisorAckTask], toTaskArgument(nodeIds, msg))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
index da9c671..bcdaeec 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/alert/VisorAlertCommand.scala
@@ -262,11 +262,12 @@ class VisorAlertCommand {
 
                         n match {
                             // Grid-wide metrics (not node specific).
-                            case "cc" if v != null => gf = makeGridFilter(v, gf, ignite.metrics().getTotalCpus)
-                            case "nc" if v != null => gf = makeGridFilter(v, gf, ignite.nodes().size)
-                            case "hc" if v != null => gf = makeGridFilter(v, gf, U.neighborhood(ignite.nodes()).size)
+                            case "cc" if v != null => gf = makeGridFilter(v, gf, ignite.cluster.metrics().getTotalCpus)
+                            case "nc" if v != null => gf = makeGridFilter(v, gf, ignite.cluster.nodes().size)
+                            case "hc" if v != null => gf = makeGridFilter(v, gf,
+                                U.neighborhood(ignite.cluster.nodes()).size)
                             case "cl" if v != null => gf = makeGridFilter(v, gf,
-                                () => (ignite.metrics().getAverageCpuLoad * 100).toLong)
+                                () => (ignite.cluster.metrics().getAverageCpuLoad * 100).toLong)
 
                             // Per-node current metrics.
                             case "aj" if v != null => nf = makeNodeFilter(v, nf, _.metrics().getCurrentActiveJobs)
@@ -344,7 +345,7 @@ class VisorAlertCommand {
                 override def apply(evt: Event): Boolean = {
                     val discoEvt = evt.asInstanceOf[DiscoveryEvent]
 
-                    val node = ignite.node(discoEvt.eventNode().id())
+                    val node = ignite.cluster.node(discoEvt.eventNode().id())
 
                     if (node != null)
                         alerts foreach (t => {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
index 49ccbc2..f012b19 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheClearCommand.scala
@@ -101,7 +101,7 @@ class VisorCacheClearCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) ignite.forNode(node.get) else ignite.forCacheNodes(cacheName)
+        val prj = if (node.isDefined) ignite.cluster.forNode(node.get) else ignite.cluster.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =
@@ -118,7 +118,7 @@ class VisorCacheClearCommand {
         t #= ("Node ID8(@)", "Cache Size Before", "Cache Size After")
 
         prj.nodes().headOption.foreach(node => {
-            val res = ignite.compute(ignite.forNode(node))
+            val res = ignite.compute(ignite.cluster.forNode(node))
                 .withName("visor-cclear-task")
                 .withNoFailover()
                 .execute(classOf[VisorCacheClearTask], toTaskArgument(node.id(), cacheName))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 42b4d2e..3c1aa01 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -360,7 +360,7 @@ class VisorCacheCommand {
                         ciT #= ("Node ID8(@), IP", "CPUs", "Heap Used", "CPU Load", "Up Time", "Size", "Hi/Mi/Rd/Wr")
 
                         sortData(m.toMap, sortType.getOrElse("hi"), reversed).foreach { case (nid, cm) =>
-                            val nm = ignite.node(nid).metrics()
+                            val nm = ignite.cluster.node(nid).metrics()
 
                             ciT += (
                                 nodeId8Addr(nid),
@@ -462,7 +462,7 @@ class VisorCacheCommand {
         assert(node != null)
 
         try {
-            val prj = node.fold(ignite.forRemotes())(ignite.forNode(_))
+            val prj = node.fold(ignite.cluster.forRemotes())(ignite.cluster.forNode(_))
 
             val nids = prj.nodes().map(_.id())
 
@@ -482,7 +482,7 @@ class VisorCacheCommand {
      */
     private def config(node: ClusterNode): VisorGridConfiguration = {
         try
-            ignite.compute(ignite.forNode(node)).withNoFailover()
+            ignite.compute(ignite.cluster.forNode(node)).withNoFailover()
                 .execute(classOf[VisorNodeConfigurationCollectorTask], emptyTaskArgument(node.id()))
         catch {
             case e: IgniteException =>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
index 83996a7..e4cade9 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCompactCommand.scala
@@ -103,7 +103,7 @@ class VisorCacheCompactCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) ignite.forNode(node.get) else ignite.forCacheNodes(cacheName)
+        val prj = if (node.isDefined) ignite.cluster.forNode(node.get) else ignite.cluster.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =
@@ -122,7 +122,7 @@ class VisorCacheCompactCommand {
         val cacheSet = Collections.singleton(cacheName)
 
         prj.nodes().foreach(node => {
-            val r = ignite.compute(ignite.forNode(node))
+            val r = ignite.compute(ignite.cluster.forNode(node))
                 .withName("visor-ccompact-task")
                 .withNoFailover()
                 .execute(classOf[VisorCacheCompactTask], toTaskArgument(node.id(), cacheSet))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
index e4382ab..a3d6967 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheScanCommand.scala
@@ -139,8 +139,8 @@ class VisorCacheScanCommand {
         }
 
         val cachePrj = node match {
-            case Some(n) => ignite.forNode(n).forCacheNodes(cacheName)
-            case _ => ignite.forCacheNodes(cacheName)
+            case Some(n) => ignite.cluster.forNode(n).forCacheNodes(cacheName)
+            case _ => ignite.cluster.forCacheNodes(cacheName)
         }
 
         if (cachePrj.nodes().isEmpty) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
index 1e9d683..b946fc3 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheSwapCommand.scala
@@ -103,7 +103,7 @@ class VisorCacheSwapCommand {
             case Some(name) => name
         }
 
-        val prj = if (node.isDefined) ignite.forNode(node.get) else ignite.forCacheNodes(cacheName)
+        val prj = if (node.isDefined) ignite.cluster.forNode(node.get) else ignite.cluster.forCacheNodes(cacheName)
 
         if (prj.nodes().isEmpty) {
             val msg =
@@ -122,7 +122,7 @@ class VisorCacheSwapCommand {
         val cacheSet = Collections.singleton(cacheName)
 
         prj.nodes().foreach(node => {
-            val r = ignite.compute(ignite.forNode(node))
+            val r = ignite.compute(ignite.cluster.forNode(node))
                 .withName("visor-cswap-task")
                 .withNoFailover()
                 .execute(classOf[VisorCacheSwapBackupsTask], toTaskArgument(node.id(), cacheSet))

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index f54d1fc..a27064d 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -189,7 +189,7 @@ class VisorConfigurationCommand {
             }
             else if (id.isDefined)
                 try {
-                    node = ignite.node(java.util.UUID.fromString(id.get))
+                    node = ignite.cluster.node(java.util.UUID.fromString(id.get))
 
                     if (node == null) {
                         scold("'id' does not match any node: " + id.get)
@@ -207,7 +207,7 @@ class VisorConfigurationCommand {
             assert(node != null)
 
             val cfg = try
-                ignite.compute(ignite.forNode(node))
+                ignite.compute(ignite.cluster.forNode(node))
                     .withNoFailover()
                     .execute(classOf[VisorNodeConfigurationCollectorTask], emptyTaskArgument(node.id()))
             catch {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index ee8fc25..f0b1610 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -135,7 +135,7 @@ class VisorDiscoveryCommand {
             val tm = if (fs.isDefined) timeFilter(fs) else Long.MaxValue
 
             if (tm > 0) {
-                val nodes = ignite.nodes()
+                val nodes = ignite.cluster.nodes()
 
                 if (nodes.isEmpty) {
                     scold("Topology is empty.")
@@ -143,7 +143,7 @@ class VisorDiscoveryCommand {
                     return
                 }
 
-                val oldest = ignite.nodes().maxBy(_.metrics().getUpTime)
+                val oldest = ignite.cluster.nodes().maxBy(_.metrics().getUpTime)
 
                 val cntOpt = argValue("c", argLst)
 
@@ -217,7 +217,7 @@ class VisorDiscoveryCommand {
         assert(node != null)
         assert(!node.isDaemon)
 
-        var evts = ignite.compute(ignite.forNode(node)).execute(classOf[VisorNodeEventsCollectorTask],
+        var evts = ignite.compute(ignite.cluster.forNode(node)).execute(classOf[VisorNodeEventsCollectorTask],
             toTaskArgument(node.id(), VisorNodeEventsCollectorTaskArg.createEventsArg(EVTS_DISCOVERY, tmFrame))).toSeq
 
         val nodeStartTime = node.metrics().getStartTime

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index a5b0a73..7ac98ec 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -245,7 +245,7 @@ class VisorEventsCommand {
             }
             else {
                 val node = try
-                    ignite.node(UUID.fromString(id.get))
+                    ignite.cluster.node(UUID.fromString(id.get))
                 catch {
                     case _: IllegalArgumentException =>
                         scold("Invalid node 'id': " + id.get)
@@ -283,7 +283,7 @@ class VisorEventsCommand {
             }
 
             val evts = try
-                ignite.compute(ignite.forNode(node)).execute(classOf[VisorNodeEventsCollectorTask],
+                ignite.compute(ignite.cluster.forNode(node)).execute(classOf[VisorNodeEventsCollectorTask],
                     toTaskArgument(nid, VisorNodeEventsCollectorTaskArg.createEventsArg(tpFilter, tmFilter)))
             catch {
                 case e: IgniteException =>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
index ba5f460..466569c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/gc/VisorGcCommand.scala
@@ -129,7 +129,7 @@ class VisorGcCommand {
             }
             else if (id.isDefined)
                 try {
-                    node = ignite.node(UUID.fromString(id.get))
+                    node = ignite.cluster.node(UUID.fromString(id.get))
 
                     if (node == null)
                         scold("'id' does not match any node: " + id.get).^^
@@ -143,7 +143,7 @@ class VisorGcCommand {
 
                 t #= ("Node ID8(@)", "Free Heap Before", "Free Heap After", "Free Heap Delta")
 
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val nids = prj.nodes().map(_.id())
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
index e066c6f..3c9b3d6 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/kill/VisorKillCommand.scala
@@ -162,7 +162,7 @@ class VisorKillCommand {
                 }
                 else if (id.isDefined)
                     try {
-                        node = ignite.node(java.util.UUID.fromString(id.get))
+                        node = ignite.cluster.node(java.util.UUID.fromString(id.get))
 
                         if (node == null)
                             scold("'id' does not match any node : " + args).^^
@@ -185,7 +185,7 @@ class VisorKillCommand {
                 val op = if (restart) "restart" else "kill"
 
                 try
-                    killOrRestart(if (node == null) ignite.nodes().map(_.id()) else Collections.singleton(node.id()), restart)
+                    killOrRestart(if (node == null) ignite.cluster.nodes().map(_.id()) else Collections.singleton(node.id()), restart)
                 catch {
                     case _: IgniteException => scold("Failed to " + op + " due to system error.").^^
                 }
@@ -219,7 +219,7 @@ class VisorKillCommand {
 
         val op = if (restart) "restart" else "kill"
 
-        if (nodes.size() == ignite.nodes().size())
+        if (nodes.size == ignite.cluster.nodes().size())
             ask("Are you sure you want to " + op + " ALL nodes? (y/n) [n]: ", "n") match {
                 case "y" | "Y" =>  ask("You are about to " + op + " ALL nodes. " +
                     "Are you 100% sure? (y/n) [n]: ", "n") match {
@@ -230,7 +230,7 @@ class VisorKillCommand {
                 case "n" | "N" => break()
                 case x => nl(); warn("Invalid answer: " + x); break()
             }
-        else if (nodes.size() > 1)
+        else if (nodes.size > 1)
             ask("Are you sure you want to " + op + " several nodes? (y/n) [n]: ", "n") match {
                 case "y" | "Y" => ()
                 case "n" | "N" => break()
@@ -244,9 +244,9 @@ class VisorKillCommand {
             }
 
         if (restart)
-            ignite.restartNodes(nodes)
+            ignite.cluster.restartNodes(nodes)
         else
-            ignite.stopNodes(nodes)
+            ignite.cluster.stopNodes(nodes)
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
index 9eb855e..79625e2 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/node/VisorNodeCommand.scala
@@ -149,7 +149,7 @@ class VisorNodeCommand {
                     }
                     else if (id.isDefined)
                         try
-                            node = ignite.node(UUID.fromString(id.get))
+                            node = ignite.cluster.node(UUID.fromString(id.get))
                         catch {
                             case e: IllegalArgumentException => warn("Invalid node ID: " + id.get).^^
                         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala
index f8b0608..e19dba2 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/ping/VisorPingCommand.scala
@@ -54,7 +54,7 @@ private case class Pinger(n: ClusterNode, res: Result) extends Runnable {
     assert(res != null)
 
     override def run() {
-        val ok = ignite.pingNode(n.id())
+        val ok = ignite.cluster.pingNode(n.id())
 
         res.synchronized {
             res.total += 1
@@ -133,7 +133,7 @@ class VisorPingCommand {
             var pings = List.empty[Pinger]
 
             if (argLst.isEmpty)
-                pings ++= ignite.nodes().map(Pinger(_, res))
+                pings ++= ignite.cluster.nodes().map(Pinger(_, res))
             else {
                 for (id8 <- argLst) {
                     if (id8._1 != null || id8._2 == null)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
index e1656d8..0dac9dd 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/start/VisorStartCommand.scala
@@ -228,7 +228,7 @@ class VisorStartCommand {
                     scold("File is a directory: " + file.getAbsolutePath).^^
 
                 try
-                    res = ignite.startNodes(file, restart, timeout, maxConn).map(t => {
+                    res = ignite.cluster.startNodes(file, restart, timeout, maxConn).map(t => {
                         Result(t.get1, t.get2, t.get3)
                     }).toSeq
                 catch {
@@ -284,7 +284,7 @@ class VisorStartCommand {
                 )
 
                 try
-                    res = ignite.startNodes(asJavaCollection(Seq(params)), null, restart, timeout, maxConn).
+                    res = ignite.cluster.startNodes(asJavaCollection(Seq(params)), null, restart, timeout, maxConn).
                         map(t => Result(t.get1, t.get2, t.get3)).toSeq
                 catch {
                     case e: IgniteException => scold(e.getMessage).^^

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index bc137ab..4185d0c 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -619,7 +619,7 @@ class VisorTasksCommand {
     private def list(p: Long, taskName: String, reverse: Boolean, all: Boolean) {
         breakable {
             try {
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val evts = ignite.compute(prj).execute(classOf[VisorNodeEventsCollectorTask],
                     toTaskArgument(prj.nodes.map(_.id()), VisorNodeEventsCollectorTaskArg.createTasksArg(p, taskName, null)))
@@ -827,7 +827,7 @@ class VisorTasksCommand {
             assert(taskName != null)
 
             try {
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val evts = ignite.compute(prj).execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(prj.nodes.map(_.id()),
                     VisorNodeEventsCollectorTaskArg.createTasksArg(null, taskName, null)))
@@ -1004,7 +1004,7 @@ class VisorTasksCommand {
             }
 
             try {
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val evts = ignite.compute(prj).execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(prj.nodes.map(_.id()),
                     VisorNodeEventsCollectorTaskArg.createTasksArg(null, null, uuid)))
@@ -1122,7 +1122,7 @@ class VisorTasksCommand {
     private def nodes(f: Long) {
         breakable {
             try {
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val evts = ignite.compute(prj).execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(prj.nodes.map(_.id()),
                     VisorNodeEventsCollectorTaskArg.createTasksArg(f, null, null)))
@@ -1234,7 +1234,7 @@ class VisorTasksCommand {
     private def hosts(f: Long) {
         breakable {
             try {
-                val prj = ignite.forRemotes()
+                val prj = ignite.cluster.forRemotes()
 
                 val evts = ignite.compute(prj).execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(prj.nodes.map(_.id()),
                     VisorNodeEventsCollectorTaskArg.createTasksArg(f, null, null)))
@@ -1251,7 +1251,7 @@ class VisorTasksCommand {
 
                 eLst.foreach(e => {
                     e.nodeIds.foreach(id => {
-                        val host = ignite.node(id).addresses.headOption
+                        val host = ignite.cluster.node(id).addresses.headOption
 
                         if (host.isDefined) {
                             var eSet = hMap.getOrElse(host.get, Set.empty[VisorExecution])

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
index 6002102..92a3aa0 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/top/VisorTopologyCommand.scala
@@ -225,7 +225,7 @@ class VisorTopologyCommand {
         assert(f != null)
         assert(hosts != null)
 
-        var nodes = ignite.forPredicate(new IgnitePredicate[ClusterNode] {
+        var nodes = ignite.cluster.forPredicate(new IgnitePredicate[ClusterNode] {
             override def apply(e: ClusterNode) = f(e)
         }).nodes()
 
@@ -327,7 +327,7 @@ class VisorTopologyCommand {
 
         nl()
 
-        val m = ignite.forNodes(nodes).metrics()
+        val m = ignite.cluster.forNodes(nodes).metrics()
 
         val freeHeap = (m.getHeapMemoryTotal - m.getHeapMemoryUsed) * 100 / m.getHeapMemoryTotal
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
index c2abbac..8bc3463 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/vvm/VisorVvmCommand.scala
@@ -164,7 +164,7 @@ class VisorVvmCommand {
             if (id8 != null && id != null)
                 scold("Only one of '-id8' or '-id' is allowed.").^^
             else if (id8 == null && id == null)
-                nodes = ignite.forRemotes().nodes().toSeq
+                nodes = ignite.cluster.forRemotes().nodes().toSeq
             else
                 if (id8 != null) {
                     val ns = nodeById8(id8)
@@ -178,7 +178,7 @@ class VisorVvmCommand {
                 }
                 else if (id != null)
                     try {
-                        val node = ignite.node(java.util.UUID.fromString(id))
+                        val node = ignite.cluster.node(java.util.UUID.fromString(id))
 
                         if (node == null)
                             scold("'id' does not match any node: " + id).^^
@@ -191,7 +191,7 @@ class VisorVvmCommand {
 
             var started = false
 
-            val neighbors = ignite.forHost(ignite.localNode).nodes()
+            val neighbors = ignite.cluster.forHost(ignite.localNode).nodes()
 
             if (U.isWindows)
                 vvmCmd = "cmd /c \"%s\"".format(vvmCmd)

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a67b72ca/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
index 83abc22..852c223 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/visor.scala
@@ -240,7 +240,7 @@ object visor extends VisorTag {
         if (g == null)
             throw new IgniteException("Visor disconnected")
         else {
-            val node = g.node(nid)
+            val node = g.cluster.node(nid)
 
             if (node == null)
                 throw new IgniteException("Node is gone: " + nid)
@@ -849,7 +849,7 @@ object visor extends VisorTag {
         }
         else if (id.isDefined)
             try {
-                val node = Option(ignite.node(java.util.UUID.fromString(id.get)))
+                val node = Option(ignite.cluster.node(java.util.UUID.fromString(id.get)))
 
                 if (node.isDefined)
                     Right(node)
@@ -1612,7 +1612,7 @@ object visor extends VisorTag {
         conOwner = true
         conTs = System.currentTimeMillis
 
-        ignite.nodes().foreach(n => {
+        ignite.cluster.nodes().foreach(n => {
             setVarIfAbsent(nid8(n), "n")
 
             val ip = n.addresses().headOption
@@ -1627,7 +1627,7 @@ object visor extends VisorTag {
                     case de: DiscoveryEvent =>
                         setVarIfAbsent(nid8(de.eventNode()), "n")
 
-                        val node = ignite.node(de.eventNode().id())
+                        val node = ignite.cluster.node(de.eventNode().id())
 
                         if (node != null) {
                             val ip = node.addresses().headOption
@@ -1662,7 +1662,7 @@ object visor extends VisorTag {
                         val ip = de.eventNode().addresses.headOption
 
                         if (ip.isDefined) {
-                            val last = !ignite.nodes().exists(n =>
+                            val last = !ignite.cluster.nodes().exists(n =>
                                 n.addresses.size > 0 && n.addresses.head == ip.get
                             )
 
@@ -1766,7 +1766,7 @@ object visor extends VisorTag {
         if (g != null && g.localNode.id == id)
             "<visor>"
         else {
-            val n = ignite.node(id)
+            val n = ignite.cluster.node(id)
 
             val id8 = nid8(id)
             val v = mfind(id8)
@@ -1834,7 +1834,7 @@ object visor extends VisorTag {
 
         t #= ("#", "Node ID8(@), IP", "Up Time", "CPUs", "CPU Load", "Free Heap")
 
-        val nodes = ignite.nodes().toList
+        val nodes = ignite.cluster.nodes().toList
 
         if (nodes.isEmpty) {
             warn("Topology is empty.")
@@ -1898,7 +1898,7 @@ object visor extends VisorTag {
 
         t #= ("#", "Int./Ext. IPs", "Node ID8(@)", "OS", "CPUs", "MACs", "CPU Load")
 
-        val neighborhood = IgniteUtils.neighborhood(ignite.nodes()).values().toIndexedSeq
+        val neighborhood = IgniteUtils.neighborhood(ignite.cluster.nodes()).values().toIndexedSeq
 
         if (neighborhood.isEmpty) {
             warn("Topology is empty.")
@@ -1956,7 +1956,7 @@ object visor extends VisorTag {
                 None
             else {
                 try
-                    Some(ignite.forNodes(neighborhood(a.toInt)))
+                    Some(ignite.cluster.forNodes(neighborhood(a.toInt)))
                 catch {
                     case e: Throwable =>
                         warn("Invalid selection: " + a)
@@ -2057,7 +2057,7 @@ object visor extends VisorTag {
     def askNodeId(): Option[String] = {
         assert(isConnected)
 
-        val ids = ignite.forRemotes().nodes().map(nid8).toList
+        val ids = ignite.cluster.forRemotes().nodes().map(nid8).toList
 
         (0 until ids.size).foreach(i => println((i + 1) + ": " + ids(i)))
 
@@ -2415,12 +2415,12 @@ object visor extends VisorTag {
                 if (g != null) {
                     try {
                         // Discovery events collected only locally.
-                        val loc = g.compute(g.forLocal()).withName("visor-log-collector").withNoFailover().
+                        val loc = g.compute(g.cluster.forLocal()).withName("visor-log-collector").withNoFailover().
                             execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(g.localNode().id(),
                             VisorNodeEventsCollectorTaskArg.createLogArg(key, LOG_EVTS ++ EVTS_DISCOVERY))).toSeq
 
                         val evts = if (!rmtLogDisabled) {
-                            val prj = g.forRemotes()
+                            val prj = g.cluster.forRemotes()
 
                             loc ++ g.compute(prj).withName("visor-log-collector").withNoFailover().
                                 execute(classOf[VisorNodeEventsCollectorTask], toTaskArgument(prj.nodes().map(_.id()),
@@ -2483,7 +2483,7 @@ object visor extends VisorTag {
 
         if (g != null)
             try
-                drawBar(g.metrics())
+                drawBar(g.cluster.metrics())
             catch {
                 case e: ClusterGroupEmptyCheckedException => logText("Topology is empty.")
                 case e: Exception => ()
@@ -2513,8 +2513,8 @@ object visor extends VisorTag {
         }
 
         logText("H/N/C" + pipe +
-            IgniteUtils.neighborhood(ignite.nodes()).size.toString.padTo(4, ' ') + pipe +
-            ignite.nodes().size().toString.padTo(4, ' ') + pipe +
+            IgniteUtils.neighborhood(ignite.cluster.nodes()).size.toString.padTo(4, ' ') + pipe +
+            ignite.cluster.nodes().size().toString.padTo(4, ' ') + pipe +
             m.getTotalCpus.toString.padTo(4, ' ') + pipe +
             bar(m.getAverageCpuLoad, m.getHeapMemoryUsed / m.getHeapMemoryTotal) + pipe
         )
@@ -2616,7 +2616,7 @@ object visor extends VisorTag {
      * @return Collection of nodes that has specified ID8.
      */
     def nodeById8(id8: String) = {
-        ignite.nodes().filter(n => id8.equalsIgnoreCase(nid8(n)))
+        ignite.cluster.nodes().filter(n => id8.equalsIgnoreCase(nid8(n)))
     }
 
     /**


Mime
View raw message