Changing the package

src/main/scala/in/ashwanthkumar/matsya/Config.scala → src/main/scala/com/indix/matsya/Config.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import java.io.File
 import java.util.concurrent.TimeUnit

src/main/scala/in/ashwanthkumar/matsya/JSONUtil.scala → src/main/scala/com/indix/matsya/JSONUtil.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import java.lang.reflect.{ParameterizedType, Type}
 

src/main/scala/in/ashwanthkumar/matsya/Matsya.scala → src/main/scala/com/indix/matsya/Matsya.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import java.lang.{Double => JDouble}
 

src/main/scala/in/ashwanthkumar/matsya/Notifier.scala → src/main/scala/com/indix/matsya/Notifier.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import in.ashwanthkumar.slack.webhook.{Slack, SlackMessage}
 

src/main/scala/in/ashwanthkumar/matsya/RocksDBStore.scala → src/main/scala/com/indix/matsya/RocksDBStore.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import java.io.File
 

src/main/scala/in/ashwanthkumar/matsya/StateStore.scala → src/main/scala/com/indix/matsya/StateStore.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 object ClusterMode {
   val Spot = 1

src/main/scala/in/ashwanthkumar/matsya/TimeSeriesStore.scala → src/main/scala/com/indix/matsya/TimeSeriesStore.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 case class Metric(machineType: String,
                   az: String,

src/main/scala/in/ashwanthkumar/matsya/Verifier.scala → src/main/scala/com/indix/matsya/Verifier.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import com.typesafe.scalalogging.slf4j.Logger
 import org.slf4j.LoggerFactory

src/test/scala/com/indix/matsya/ClusterConfigTest.scala

@@ -0,0 +1,37 @@
+package com.indix.matsya
+
+import com.typesafe.config.ConfigFactory
+import org.scalatest.FlatSpec
+import org.scalatest.Matchers.{be, convertToAnyShouldWrapper}
+
+
+class ClusterConfigTest extends FlatSpec {
+
+  "ClusterConfig Object" should "create ClusterConfig from config " in {
+
+    val config = ConfigFactory.parseURL(this.getClass.getResource("/test-cluster-config.conf"))
+
+    val actualClusterConfig = ClusterConfig.from(config)
+
+    actualClusterConfig.name should be("Test Hadoop Cluster")
+    actualClusterConfig.spotASG should be("test-asg-spot")
+    actualClusterConfig.odASG should be("test-asg-od")
+    actualClusterConfig.machineType should be("c3.2xlarge")
+    actualClusterConfig.maxBidPrice should be(0.420)
+    actualClusterConfig.maxThreshold should be(0.8)
+    actualClusterConfig.maxNrOfTimes should be(5)
+    actualClusterConfig.odPrice should be(0.420)
+    actualClusterConfig.fallBackToOnDemand should be(true)
+    actualClusterConfig.odCoolOffPeriodInMillis should be(2700000)
+
+    val expectedSubnetsMap = Map("us-east-1c" -> "subnet-3",
+      "us-east-1d" -> "subnet-4",
+      "us-east-1a" -> "subnet-1",
+      "us-east-1e" -> "subnet-5",
+      "us-east-1b" -> "subnet-2")
+
+    actualClusterConfig.subnets should be(expectedSubnetsMap)
+
+  }
+
+}

src/test/scala/in/ashwanthkumar/matsya/ConfigReaderTest.scala → src/test/scala/com/indix/matsya/ConfigReaderTest.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers.{be, convertToAnyShouldWrapper, have}

src/test/scala/in/ashwanthkumar/matsya/DefaultVerifierTest.scala → src/test/scala/com/indix/matsya/DefaultVerifierTest.scala

@@ -1,4 +1,4 @@
-package in.ashwanthkumar.matsya
+package com.indix.matsya
 
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers.{be, convertToAnyShouldWrapper}

src/test/scala/com/indix/matsya/MatsyaTest.scala

@@ -0,0 +1,77 @@
+package com.indix.matsya
+
+import com.amazonaws.services.autoscaling.AmazonAutoScalingClient
+import com.amazonaws.services.ec2.AmazonEC2Client
+import org.joda.time.{DateTime, DateTimeUtils}
+import org.mockito.Mockito.{mock, when}
+import org.scalatest.FlatSpec
+import org.scalatest.Matchers.{be, convertToAnyShouldWrapper}
+
+
+class MatsyaTest extends FlatSpec {
+
+  "hasCooledOff " should "return true when cool off time is greater than given in config" in {
+    val clusterConfig = mock(classOf[ClusterConfig])
+
+    val c2Client = mock(classOf[AmazonEC2Client])
+    val autoScalingClient = mock(classOf[AmazonAutoScalingClient])
+    val timeSeriesStore = mock(classOf[TimeSeriesStore])
+    val stateStore = mock(classOf[StateStore])
+    val notifier = mock(classOf[Notifier])
+
+    val matsyaConfig = MatsyaConfig(List(clusterConfig), "", None)
+
+    val Matsya = new Matsya(c2Client, autoScalingClient, matsyaConfig, timeSeriesStore, stateStore, notifier)
+
+    val state = mock(classOf[State])
+
+    val nowTimeInMilli = DateTime.now.getMillis
+
+    val lastModeChangedTimestamp = DateTime.now.minusHours(1).getMillis
+
+    DateTimeUtils.setCurrentMillisFixed(nowTimeInMilli)
+
+    when(state.lastModeChangedTimestamp).thenReturn(lastModeChangedTimestamp)
+
+    val millisecsFor30Secs = 30000
+
+    when(clusterConfig.odCoolOffPeriodInMillis).thenReturn(millisecsFor30Secs)
+
+    Matsya.hasCooledOff(clusterConfig, state) should be(true)
+
+
+  }
+
+  it should "return false when cool off time is lesser than given in config" in {
+    val clusterConfig = mock(classOf[ClusterConfig])
+
+    val c2Client = mock(classOf[AmazonEC2Client])
+    val autoScalingClient = mock(classOf[AmazonAutoScalingClient])
+    val timeSeriesStore = mock(classOf[TimeSeriesStore])
+    val stateStore = mock(classOf[StateStore])
+    val notifier = mock(classOf[Notifier])
+
+    val matsyaConfig = MatsyaConfig(List(clusterConfig), "", None)
+
+    val Matsya = new Matsya(c2Client, autoScalingClient, matsyaConfig, timeSeriesStore, stateStore, notifier)
+
+    val state = mock(classOf[State])
+
+    val nowTimeInMilli = DateTime.now.getMillis
+
+    val lastModeChangedTimestamp = DateTime.now.minusSeconds(1).getMillis
+
+    DateTimeUtils.setCurrentMillisFixed(nowTimeInMilli)
+
+    when(state.lastModeChangedTimestamp).thenReturn(lastModeChangedTimestamp)
+
+    val millisecsFor30Secs = 30000
+
+    when(clusterConfig.odCoolOffPeriodInMillis).thenReturn(millisecsFor30Secs)
+
+    Matsya.hasCooledOff(clusterConfig, state) should be(false)
+
+
+  }
+
+}

src/test/scala/in/ashwanthkumar/matsya/ClusterConfigTest.scala

@@ -2,6 +2,7 @@ package in.ashwanthkumar.matsya
 
 import java.io.File
 
+import com.indix.matsya.ClusterConfig
 import com.typesafe.config.ConfigFactory
 import org.scalatest.FlatSpec
 import org.scalatest.Matchers.{be, convertToAnyShouldWrapper}

src/test/scala/in/ashwanthkumar/matsya/MatsyaTest.scala

@@ -2,6 +2,7 @@ package in.ashwanthkumar.matsya
 
 import com.amazonaws.services.autoscaling.AmazonAutoScalingClient
 import com.amazonaws.services.ec2.AmazonEC2Client
+import com.indix.matsya._
 import org.joda.time.{DateTime, DateTimeUtils}
 import org.mockito.Mockito.{mock, when}
 import org.scalatest.FlatSpec