app42 0.6.4 → 0.7.0

data/RELEASE.md

@@ -20,7 +20,7 @@ Client library and command-line tool to deploy and manage apps on App42PaaS.
    - Node.js support
    - WordPress support
    - BPaaS setup downgrade
-   - WordPress setup donwgrade   
+   - WordPress setup donwgrade
 
 ### 0.6.1 (22-01-2014)
    
@@ -41,4 +41,8 @@ Client library and command-line tool to deploy and manage apps on App42PaaS.
 
    - Add Elastic IP to GPaaS
    - Update GPaaS dashboard
-   
+   
+### 0.6.7 (05-07-2014)
+
+   - Dedicated Support
+   - Golang Support

data/lib/app42/base/constants.rb

@@ -28,6 +28,11 @@ module App42
     # flavour type
     FLAVOUR_TYPE = ['light', 'medium', 'heavy']
 
+    # app operation type
+    APP_STOP = { "hardStop" => "Hard Stop", "softStop" => "Soft Stop"}
+    APP_START = { "hardStart" => "Hard Start", "softStart" => "Soft Start"}
+    APP_RESTART = { "hardRestart" => "Hard Restart", "softRestart" => "Soft Restart"}
+
     DATABASE_NAME_NOT_ALLOWED = %w(mysql couchdb mongodb postgresql database sql)
 
     # regex for special character
@@ -41,5 +46,4 @@ module App42
 
     # regex for IP Address
     IP_REGEX = /^([0]?\d\d?|1[0-1,3-9]\d|12[0-6,8-9]|2[0-4]d|25[0-5])\.([01]?\d\d?|2[0-4]\d|25[0-5])\.([01]?\d\d?|2[0-4]\d|25[0-5])\.((?!0)|(?!1)|010|(01[0-9]{1,1}&0[1-9]{1,2})|0[0-9]{1,1}[1-9]{1,1}|[2-9]{0,2}|1[0-9]{1,2}|2[0-4]\d|25[0-4])$/
-
-end
+end

data/lib/app42/base/help.rb

@@ -200,29 +200,32 @@ Example:
 
   Checking App Name Availability... OK
 
-  1: Shared
-  Select Instance Type [Shared]: 
-
-  1: Amazon (Oregon)
-  Select IaaS Provider [Amazon (Oregon)]: 
-
-  1: Ruby 2.0.0
-  2: Java 6
-  3: Java 7
-  4: PHP 5.3
-  5: PHP 5.5
-  6: Node 0.10.22
-  Select Runtime [Ruby 2.0.0]: 
-
-  1: Ruby on Rack 
-  2: Rails 4.0
-  3: Sinatra 1.4
-  Select Framework [Ruby on Rack ]: 
-
-  1: Passenger 4.0
-  2: Thin 1.6
-  3: Unicorn 4.7
-  Select Web Server [Passenger 4.0]: 
+	1: Shared
+	2: Dedicated
+	Select Instance Type [Shared]:
+
+	1: Amazon (Northern Virginia)
+	Select IaaS Provider [Amazon (Northern Virginia)]:
+
+	1: Ruby 2.0.0
+	2: Java 6
+	3: Java 7
+	4: PHP 5.3
+	5: PHP 5.5
+	6: Node 0.10.22
+	7: Python 2.7
+	8: GO 1.3
+	Select Runtime [Ruby 2.0.0]:
+
+	1: Ruby on Rack
+	2: Rails 4.0
+	3: Sinatra 1.4
+	Select Framework [Ruby on Rack ]:
+
+	1: Passenger 4.0
+	2: Thin 1.6
+	3: Unicorn 4.7
+	Select Web Server [Passenger 4.0]:
 
   Specify Kontena Power: 1
 
@@ -297,6 +300,9 @@ Options:
   [--app APP]      # Name of app, you want to scale
 
 Example:
+
+  **For Shared App**
+
   $app42 scale
   Enter App Name: demo
 
@@ -307,6 +313,23 @@ Example:
   Horizontal scale by instance(s) [1]: 
   Scaling Application demo by instance 1... OK
 
+  Operation is in progress, Please wait...-
+  Scale has been completed successfully.
+
+  **For Dedicated App**
+
+  $app42 scale
+  Enter App Name: demo
+
+  1: t1.micro
+  2: m1.small
+  3: m1.medium
+  4: m1.large
+  5: m1.xlarge
+  Select Instance Configuration [t1.micro]: 2
+
+  Scaling Application demo by instance m1.small... OK
+
   Operation is in progress, Please wait...-
   Scale has been completed successfully.
           DESC
@@ -323,6 +346,9 @@ Options:
   [--app APP]      # Name of app, you want to descale
 
 Example:
+
+  **For Shared App**
+
   $app42 descale
   Enter App Name: demo
 
@@ -333,6 +359,23 @@ Example:
   Horizontal descale by instance(s) [1]: 1
   Descaling Application demo by instance 1... OK
 
+  Operation is in progress, Please wait...|
+  Descale has been completed successfully.
+
+  **For Dedicated App**
+
+  Enter App Name: demo
+
+  1: t1.micro
+  2: m1.small
+  3: m1.medium
+  4: m1.large
+  5: m1.xlarge
+
+  Select Instance Configuration [t1.micro]: 1
+
+  Descaling Application demo by instance t1.micro... OK
+
   Operation is in progress, Please wait...|
   Descale has been completed successfully.
           DESC
@@ -349,6 +392,9 @@ Options:
   [--app APP]      # Name of app, you want to start
 
 Example:
+
+  **For Shared App**
+
   $app42 start --app demo
   Starting Application demo... OK
 
@@ -357,6 +403,19 @@ Example:
   -
   2 out of 3 started
   |
+  App has been started successfully.
+
+  **For Dedicated App**
+
+  Enter App Name: demo
+
+  1: Hard Start
+  2: Soft Start
+  App Start Type [Hard Start]: 1
+
+  Starting Application demo... OK
+
+  Operation is in progress, Please wait...-
   App has been started successfully.
           DESC
 
@@ -373,6 +432,9 @@ Options:
   [--app APP]      # Name of app, you want to stop
 
 Example:
+
+  **For Shared App**
+
   $app42 stop --app demo
   Stopping Application demo... OK
 
@@ -381,6 +443,19 @@ Example:
   -
   2 out of 3 stopped
   -
+  App has been stopped successfully.
+
+  **For Dedicated App**
+
+  Enter App Name: demo
+
+  1: Hard Stop
+  2: Soft Stop
+  App Stop Type [Hard Stop]: 1
+
+  Stopping Application demo... OK
+
+  Operation is in progress, Please wait...
   App has been stopped successfully.
           DESC
         end
@@ -396,6 +471,9 @@ Options:
   [--app APP]      # Name of app, you want to restart
 
 Example:
+
+  **For Shared App**
+
   $app42 start --app demo
   Restarting Application demo... OK
 
@@ -404,6 +482,19 @@ Example:
   -
   2 out of 3 restarted
   |
+  App has been restarted successfully.
+
+  **For Dedicated App**
+
+  Enter App Name: demo
+
+  1: Hard Restart
+  2: Soft Restart
+  App Start Type [Hard Restart]: 1
+
+  Restarting Application demo... OK
+
+  Operation is in progress, Please wait...-
   App has been restarted successfully.
           DESC
         end

data/lib/app42/base/util.rb

@@ -408,6 +408,16 @@ module App42
         end
       end
 
+      # rest call to server to check whether +Static IP+ assigned OR not.
+      # return true if +Static IP+ assigned else false
+      def is_static_ip_assigned? gpaas_name
+        query_params = params
+        query_params.store('setupName', gpaas_name)
+
+        setup_info = build_get_request query_params, 'gpaas', "#{@options[:setup]}"
+        setup_info["setupInfo"]["staticIP"] == "NULL" ? (return false) : (return true)
+      end
+
       # Check whether +git URL+ is valid OR not
       # given +git URL+ must end with +.git+ extension
       def validate_git_url git_url
@@ -447,4 +457,4 @@ module App42
 
     end
   end
-end
+end

data/lib/app42/command/app.rb

@@ -10,8 +10,8 @@ module App42
       # collect all required attributes for new VM spawn
       def setup_infra
         app_name = get_app_name_and_check_app_url_availability
-        vm_type = get_vm_types
-        iaas = get_iaas_providers
+        vm_type = get_vm_types "app"
+        iaas = get_iaas_providers vm_type
         app_name, source_url = get_app_source app_name, iaas, vm_type
       end
 
@@ -70,13 +70,17 @@ module App42
       # @param vm_type
       # @return host name
       def collect_vm_details app_name, iaas, vm_type
-        runtime = get_runtime
+        runtime = get_runtime iaas, vm_type
         framework = get_framework iaas, vm_type, runtime
         webserver = get_webserver iaas, vm_type, runtime, framework
         os = get_os_for_app iaas, vm_type, runtime, framework, webserver
         # FIXME, may be configure out later
         # instance = get_instance 'new_vm'
-        kontena = get_vmconfig
+        if vm_type == "Shared"
+          kontena = get_vmconfig
+        else
+          kontena = App42::Command::Gpaas.new.get_instance_config iaas, vm_type
+        end
         setup_infra_res = App42::Command::Base.new.create_infrastructure app_name, iaas, vm_type, runtime, framework, webserver, os, kontena
         exit! if setup_infra_res
       end
@@ -132,6 +136,10 @@ module App42
       # then scale app by no of instance
       def scale
         @options[:name] = get_app_name if @options[:name].nil?
+
+        app_info = app_information 'app', @options[:name]
+        scale_dedicated_app @options[:name] if app_info["appInfo"]["vmType"] && app_info["appInfo"]["vmType"] == "Dedicated"
+
         scale_type = ask_scale_type
         if scale_type == App42::SCALE_TYPE.first
           hscale @options[:name]
@@ -140,10 +148,34 @@ module App42
         end
       end
 
+      def scale_dedicated_app app_name
+        iaas, vm_type = get_iaas_and_vm_type_of_app app_name
+        vm_config = App42::Command::Gpaas.new.get_instance_config iaas, vm_type
+        scale_or_descal_res = scale_or_descale_app "scale", vm_config, app_name, "vm"
+        exit! if scale_or_descal_res
+      end
+
+      def descale_dedicated_app app_name
+        iaas, vm_type = get_iaas_and_vm_type_of_app app_name
+        vm_config = App42::Command::Gpaas.new.get_instance_config iaas, vm_type
+        scale_or_descal_res = scale_or_descale_app "descale", vm_config, app_name, "vm"
+        exit! if scale_or_descal_res
+      end
+
+      # return setup details
+      def get_iaas_and_vm_type_of_app app_name
+         app_details = App42::Command::Config.new.get_app_details app_name
+         return app_details['iaas'], app_details['containerType'] if app_details['success']
+      end
+
       # read +app name+ and number of +instance+ from user
       # then descale app by no of instance
       def descale
         @options[:name] = get_app_name if @options[:name].nil?
+
+        app_info = app_information 'app', @options[:name]
+        descale_dedicated_app @options[:name] if app_info["appInfo"]["vmType"] && app_info["appInfo"]["vmType"] == "Dedicated"
+
         scale_type = ask_scale_type
         if scale_type == App42::SCALE_TYPE.first
           hdescale @options[:name]
@@ -190,7 +222,16 @@ module App42
       #
       def start
         @options[:name] = get_app_name if @options[:name].nil?
-        app_operation_req = app_operation __method__, @options[:name] if is_app_exist? @options[:name]
+        app_info = app_information 'app', @options[:name]
+
+        action_type_id = nil
+        if app_info["appInfo"]["name"] && app_info["appInfo"]["vmType"] == "Dedicated"
+          action_type = input "App Start Type", APP_START.values, true
+
+          APP_START.each_pair{|action| action_type_id = action[0] if action[1] == action_type}
+        end
+
+        app_operation_req = app_operation __method__, @options[:name], action_type_id if is_app_exist? @options[:name]
         exit! if app_operation_req
       end
 
@@ -200,7 +241,16 @@ module App42
       #
       def stop
         @options[:name] = get_app_name if @options[:name].nil?
-        app_operation_req = app_operation __method__, @options[:name] if is_app_exist? @options[:name]
+        app_info = app_information 'app', @options[:name]
+
+        action_type_id = nil
+        if app_info["appInfo"]["name"] && app_info["appInfo"]["vmType"] == "Dedicated"
+          action_type = input "App Stop Type", APP_STOP.values, true
+
+          APP_STOP.each_pair{|action| action_type_id = action[0] if action[1] == action_type}
+        end
+
+        app_operation_req = app_operation __method__, @options[:name], action_type_id if is_app_exist? @options[:name]
         exit! if app_operation_req
       end
 
@@ -210,7 +260,15 @@ module App42
       #
       def restart 
         @options[:name] = get_app_name if @options[:name].nil?
-        app_operation_req = app_operation __method__, @options[:name] if is_app_exist? @options[:name]
+        app_info = app_information 'app', @options[:name]
+
+        action_type_id = nil
+        if app_info["appInfo"]["name"] && app_info["appInfo"]["vmType"] == "Dedicated"
+          action_type = input "App Start Type", APP_RESTART.values, true
+
+          APP_RESTART.each_pair{|action| action_type_id = action[0] if action[1] == action_type}
+        end
+        app_operation_req = app_operation __method__, @options[:name], action_type_id if is_app_exist? @options[:name]
         exit! if app_operation_req
       end
 
@@ -295,4 +353,4 @@ module App42
 
     end
   end 
-end
+end

data/lib/app42/command/base.rb

@@ -58,8 +58,8 @@ module App42
       end      
 
       # get supported virtual machine type by app42paas
-      def get_vm_types
-        vm_type = App42::Command::Config.new.get_vm_type
+      def get_vm_types resource_type
+        vm_type = App42::Command::Config.new.get_vm_type resource_type
         vm_type_array = vm_type['deploymentType'].map(&:capitalize)
         input "Select Instance Type", vm_type_array, true
       end
@@ -69,9 +69,9 @@ module App42
       end
       
       # @return iaas providers
-      def get_iaas_providers
+      def get_iaas_providers vm_type
         iaas_provider_hash = {}
-        iaas_providers = App42::Command::Config.new.get_iaas_provider
+        iaas_providers = App42::Command::Config.new.get_iaas_provider vm_type
 
         iaas_providers['iaas'].select {|each_iaas| iaas_provider_hash["#{each_iaas['id']}"] = each_iaas['name'] + ' ' + each_iaas['zone']}
         iaas = input "Select IaaS Provider", iaas_provider_hash.values, true
@@ -118,10 +118,11 @@ module App42
       end
 
       # get supported runtime by app42paas
-      def get_runtime
-        runtime_hash = {}
-        runtimes = App42::Command::Config.new.get_runtimes
-        
+      def get_runtime iaas, vm_type
+        runtime_hash, runtimes = {}, nil
+        runtimes = App42::Command::Config.new.get_runtimes_for_dedicated iaas, vm_type if vm_type == "Dedicated"
+        runtimes = App42::Command::Config.new.get_runtimes_for_shared if vm_type == "Shared"
+
         runtimes['runtimes'].select {|each_rt| runtime_hash["#{each_rt['id']}"] = each_rt['name'] + ' ' + each_rt['version']}
         rt = input "Select Runtime", runtime_hash.values, true
         
@@ -300,7 +301,8 @@ module App42
       # infrastructure setup call
       def create_infrastructure  app_name, iaas, vm_type, runtime, framework, webserver, os, kontena
         begin
-          body = {'app42' => {"request"=> {
+          if vm_type == "Shared"
+            body = {'app42' => {"request"=> {
               "appName"       => app_name,
               "iaas"          => iaas,
               "vmType"        => vm_type,
@@ -310,6 +312,18 @@ module App42
               "os"            => os,
               "kontenaPower"  => kontena
           }}}.to_json
+          else
+            body = {'app42' => {"request"=> {
+              "appName"       => app_name,
+              "iaas"          => iaas,
+              "vmType"        => vm_type,
+              "runtime"       => runtime,
+              "framework"     => framework,
+              "webServer"     => webserver,
+              "os"            => os,
+              "memoryConfig"  => kontena
+          }}}.to_json
+          end
 
           query_params = params
           query_params.store('body', body)
@@ -690,12 +704,21 @@ module App42
 
       # Scale or descale application by no of instance,
       # expect +what+ as operation and instance as no of instance
-      def scale_or_descale_app what, instance, app_name
-        begin  
-          body = {'app42' => {"request"=> {
-              'appName'        => app_name,
-              "instanceCount"  => instance.to_s
-          }}}.to_json
+      def scale_or_descale_app what, instance, app_name, action_type = nil
+        begin
+          if action_type == "vm"
+            body = {"app42" => {"request"=> {
+		          "appName"       => app_name,
+		          "memoryConfig"  => instance.to_s,
+		          "actionType"    => action_type
+		      }}}.to_json
+          else
+            body = {"app42" => {"request"=> {
+                  "appName"        => app_name,
+                  "instanceCount"  => instance.to_s,
+                  "actionType"     => action_type
+              }}}.to_json
+          end
 
           query_params = params
           query_params.store('body', body)
@@ -780,12 +803,13 @@ module App42
 
       # All application operation will take placed like app start, stop etc.
       # expect +what+ as operation and +app_name+ as application name.
-      def app_operation what, app_name
+      def app_operation what, app_name, action_type = nil
         begin
           if what.to_s == 'stop'
             response = with_progress(Paint[ "Stopping Application #{app_name}", :yellow]) do |s|
               body = {'app42' => {"request"=> {
-                "appName" => app_name
+                "appName" => app_name,
+                "actionType" => action_type
               }}}.to_json
 
               query_params = params
@@ -800,7 +824,8 @@ module App42
                 build_delete_request query_params, "app", "#{app_name}"
               else
                 body = {'app42' => {"request"=> {
-                  "appName" => app_name
+                  "appName" => app_name,
+                  "actionType" => action_type
                 }}}.to_json
 
                 query_params = params
@@ -1455,4 +1480,4 @@ module App42
       end
     end
   end
-end
+end

data/lib/app42/command/config.rb

@@ -15,8 +15,8 @@ module App42::Command
     #
     # return list of virtual machine type
     #
-    def get_vm_type
-      build_get_request params, 'info', 'subscription'
+    def get_vm_type resource_type
+      build_get_request params, 'info', "subscription/#{resource_type}"
     end
 
     #
@@ -29,8 +29,10 @@ module App42::Command
     #
     # return list of iaas_providers
     #
-    def get_iaas_provider
-      build_get_request params, 'info', 'iaasproviders'
+    def get_iaas_provider( vm_type = "List")
+	  query_params = params
+      query_params.store('type', vm_type)
+      build_get_request query_params, 'info', "iaasproviders/#{vm_type}"
     end
 
     #
@@ -40,6 +42,23 @@ module App42::Command
       build_get_request params, 'info', 'runtimes'
     end
 
+    #
+    # return list of runtimes for shared
+    #
+    def get_runtimes_for_shared
+      build_get_request params, 'info', 'runtimes'
+    end
+
+    #
+    # return list of runtimes for dedicated VM
+    #
+    def get_runtimes_for_dedicated iaas, vm_type
+      query_params = params
+      query_params.store('vmType', vm_type)
+      query_params.store('iaas', iaas)
+      build_get_request query_params, 'info', 'runtimes/dedicated'
+    end
+
     #
     # return list of setup type
     #
@@ -77,6 +96,15 @@ module App42::Command
       build_get_request query_params, 'info', 'setupdetails'
     end
 
+    #
+    # return setup details
+    #
+    def get_app_details app_name
+      query_params = params
+      query_params.store('appName', app_name)
+      build_get_request query_params, 'info', 'appdetails'
+    end
+
     #
     # return list of flavour
     #
@@ -242,4 +270,4 @@ module App42::Command
     end
 
   end	
-end
+end

data/lib/app42/command/gpaas.rb

@@ -10,7 +10,7 @@ module App42
       def setup
         setup_name = get_setup_name_and_check_setup_url_availability if App42::Command::Auth.is_authorize_for_dedicated?
         vm_type = 'dedicated' # GPaaS need only dedicated server
-        iaas = get_iaas_providers
+        iaas = get_iaas_providers vm_type
         setup_type = get_setup_type
         flavour = get_instance_config  iaas, vm_type
         ans = ask Paint["#{Message::ADD_STATIC_IP}", :red], :default => true ; print_new_line
@@ -32,10 +32,12 @@ module App42
         exit! if response
       end
 
-      # collect GPaaS setup name from user and proceed GPaaS stop request
       def stop
-        ans = ask Paint["#{Message::URL_WILL_CHANGE}", :red], :default => true ; print_new_line
-        ans == true ? (@options[:setup] = get_setup_name if @options[:setup].nil?) : (exit!)
+        @options[:setup] = get_setup_name if @options[:setup].nil?
+        unless is_static_ip_assigned? @options[:setup]
+          ans = ask Paint["#{Message::URL_WILL_CHANGE}", :red], :default => true ; print_new_line
+          ans == true ? (@options[:setup] = get_setup_name if @options[:setup].nil?) : (exit!)
+        end
         response = gpaas_operation __method__, @options[:setup] if is_setup_name_exist? @options[:setup]
         exit! if response
       end
@@ -140,4 +142,4 @@ module App42
       end
    end
   end
-end
+end

data/lib/app42/command/service.rb

@@ -87,9 +87,9 @@ module App42::Command
 
       database = '0' if service == 'redis283'
         
-      vm_type = get_vm_types
+      vm_type = get_vm_types "service"
       
-      iaas = get_iaas_providers
+      iaas = get_iaas_providers vm_type
 
       os = get_os_for_service iaas, vm_type, service
       

data/lib/app42/command/setup.rb

@@ -9,8 +9,8 @@ module App42
       # required inputs are setup_name, vm_type, iaas, setup_type and flavour
       def setup_cloud_api
         setup_name = get_setup_name_and_check_setup_url_availability
-        vm_type = get_vm_types
-        iaas = get_iaas_providers
+        vm_type = get_vm_types nil
+        iaas = get_iaas_providers vm_type
         setup_type = get_setup_type
         flavour = get_flavour
         setup_cloud_api_res = App42::Command::Base.new.create_cloud_setup setup_name, iaas, vm_type, setup_type, flavour

data/lib/app42/command/wordpress.rb

@@ -9,8 +9,8 @@ module App42
       # required inputs are wordpress_name, vm_type, iaas, setup_type and flavour
       def setup
         wordpress_name = get_wordpress_name_and_check_wordpress_url_availability
-        vm_type = get_vm_types
-        iaas = get_iaas_providers
+        vm_type = get_vm_types nil
+        iaas = get_iaas_providers vm_type
         flavour = get_flavour
         setup_cloud_api_res = App42::Command::Base.new.create_wordpress_setup wordpress_name, iaas, vm_type, flavour
         exit! if setup_cloud_api_res

data/lib/app42/version.rb

@@ -2,8 +2,8 @@ module App42
   module Version
   	module VERSION
       MAJOR = 0
-      MINOR = 6
-      TINY  = 4
+      MINOR = 7
+      TINY  = 0
       PRE   = "alpha"
 
       STRING = [MAJOR, MINOR, TINY].compact.join('.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: app42
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler