vagrant-subutai 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbe4e42e53dfee5ad7d45eaf9aa495c2c69012e6
-  data.tar.gz: 8e01599337060878df7157e6f83ba695d43b5405
+  metadata.gz: c11540a4900e8fd5dd696abdbdd7f55d250a3da2
+  data.tar.gz: d7425aa0e5ebfb8ae2c35441e11f6c22a00fe64c
 SHA512:
-  metadata.gz: 164937201e9c9878ff768e72ec1216e6bf9e6b73ea6e77cf843aa3a22ad3bdc15eb0a8735a6c6c1633ddc0261b99b5ded675eeb59fbbde16b81ff44c14423eac
-  data.tar.gz: 6a219a6ab58ef9b22cd177574adfbcf380f2c0e6d2882d5cdf8cf7a434ffddf851f5135a3591b37421cd328bf28ad9a4b78484f2824291026ccad367fc5095e4
+  metadata.gz: 47fd283c5bac49348218786a106053f6296fee19f6238bd4ef16cc4eaa27560cef4125ebd5abc5bc549667e798dee5ea5ce40ad6e1d83d47c50ae8a0965b5a11
+  data.tar.gz: 6b6c5f8ba5002ce5146709118d67655afd531b4fbe3656c5257007385e95b7c8caca49127079383e0eed0e32021ff16f6402710b9fc2d5f6a504c08b1af3b05c

data/CHANGELOG.md

@@ -32,4 +32,10 @@ FEATURES:
 
 FEATURES: 
   - Libvirt disk size function added
-  - Cdn verfify certificate removed
+  - Cdn verfify certificate removed
+  
+## 1.1.5 (March 31, 2018) 
+
+FEATURES:
+  - [Command] `deregister` command added (For unregistering the PeerOS from Bazaar)
+ 

data/README.md

@@ -43,6 +43,7 @@ COMMANDS:
        update                  - update Subutai management, container or Resource host
        vxlan                   - VXLAN tunnels operation
        register                - register Subutai PeerOS to Bazaar
+       deregister              - deregister Subutai PeerOS from Bazaar
        fingerprint             - shows fingerprint Subutai Console
        open                    - open the Subutai PeerOS in browser
        blueprint               - run blueprint provisioning

data/build.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-rm vagrant-subutai-1.1.4.gem
+rm vagrant-subutai-1.1.5.gem
 gem build vagrant-subutai.gemspec
 
 gem uninstall vagrant-subutai
-gem install ./vagrant-subutai-1.1.4.gem
+gem install ./vagrant-subutai-1.1.5.gem
 
 vagrant plugin uninstall vagrant-subutai
-vagrant plugin install ./vagrant-subutai-1.1.4.gem
+vagrant plugin install ./vagrant-subutai-1.1.5.gem

data/lib/vagrant-subutai/command.rb

@@ -26,6 +26,8 @@ module VagrantSubutai
       case ARGV[1]
         when 'register'
           subutai_cli.register(nil, nil, check_subutai_console_url(subutai_cli))
+        when 'deregister'
+          subutai_cli.deregister(nil, nil, check_subutai_console_url(subutai_cli))
         when 'fingerprint'
           subutai_cli.fingerprint(check_subutai_console_url(subutai_cli))
         when 'open'
@@ -100,6 +102,7 @@ COMMANDS:
      update                  - update Subutai management, container or Resource host
      vxlan                   - VXLAN tunnels operation
      register                - register Subutai PeerOS to Bazaar
+     deregister              - deregister Subutai PeerOS from Bazaar
      fingerprint             - shows fingerprint Subutai Console
      open                    - open the Subutai PeerOS in browser
      blueprint               - run blueprint provisioning

data/lib/vagrant-subutai/configs/configs.rb

@@ -113,18 +113,19 @@ module VagrantSubutai
       COMMAND_LOG   = '/rest/ui/commands/async/{COMMAND_ID}?sptoken='.freeze
 
       module V1
-        TOKEN        = '/rest/v1/identity/gettoken'.freeze
-        REGISTER_HUB = '/rest/v1/hub/register?sptoken='.freeze
-        APPROVE      = '/rest/v1/registration/requests'.freeze
-        FINGERPRINT  = '/rest/v1/security/keyman/getpublickeyfingerprint'.freeze
-        REQUESTS     = '/rest/v1/registration/requests?sptoken='.freeze
-        ENVIRONMENT  = '/rest/v1/environments?sptoken='.freeze
-        HOSTS        = '/rest/v1/hosts?sptoken='.freeze
-        ENVIRONMENTS = '/rest/v1/environments?sptoken='.freeze
-        LOG          = '/rest/v1/tracker/operations/ENVIRONMENT%20MANAGER/'.freeze
-        RESOURCES    = '/rest/v1/peer/resources?sptoken='.freeze
-        DOMAIN       = '/rest/ui/environments/'.freeze
-        READY        = '/rest/v1/peer/ready'.freeze
+        TOKEN           = '/rest/v1/identity/gettoken'.freeze
+        DE_REGISTER_HUB = '/rest/v1/hub/unregister?sptoken='.freeze
+        REGISTER_HUB    = '/rest/v1/hub/register?sptoken='.freeze
+        APPROVE         = '/rest/v1/registration/requests'.freeze
+        FINGERPRINT     = '/rest/v1/security/keyman/getpublickeyfingerprint'.freeze
+        REQUESTS        = '/rest/v1/registration/requests?sptoken='.freeze
+        ENVIRONMENT     = '/rest/v1/environments?sptoken='.freeze
+        HOSTS           = '/rest/v1/hosts?sptoken='.freeze
+        ENVIRONMENTS    = '/rest/v1/environments?sptoken='.freeze
+        LOG             = '/rest/v1/tracker/operations/ENVIRONMENT%20MANAGER/'.freeze
+        RESOURCES       = '/rest/v1/peer/resources?sptoken='.freeze
+        DOMAIN          = '/rest/ui/environments/'.freeze
+        READY           = '/rest/v1/peer/ready'.freeze
       end
       LOGIN = '/login'.freeze
       DEFAULT_PASSWORDS = 'secret'.freeze

data/lib/vagrant-subutai/packer/subutai_config.rb

@@ -383,24 +383,31 @@ module SubutaiConfig
     end
   end
 
-  # TODO remove Openssl verify (if certificate expired in cdn this code will be crashed)
   def self.get_latest_id_artifact(owner, artifact_name)
-    url = url_of_cdn + '/raw/info?owner=' + owner + '&name=' + artifact_name
-    uri = URI.parse(url)
-    https = Net::HTTP.new(uri.host, uri.port)
-    https.use_ssl = true
-    https.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    https.read_timeout = 3600 # an hour
-
-    request = Net::HTTP::Get.new(uri.request_uri)
-    response = https.request(request)
-
-    case response
-      when Net::HTTPOK
-        response = JSON.parse(response.body)
-        response[0]['id']
-      else
-        Put.error "Try again! #{response.body} template name #{name}, owner #{owner}"
+    begin
+      url = url_of_cdn + '/raw/info?owner=' + owner + '&name=' + artifact_name
+      uri = URI.parse(url)
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = true
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      https.read_timeout = 3600 # an hour
+
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = https.request(request)
+
+      case response
+        when Net::HTTPOK
+          response = JSON.parse(response.body)
+          response[0]['id']
+        when Net::HTTPNotFound
+          Put.error "#{response.body} template name #{name}, owner #{owner}"
+      end
+    rescue Errno::ECONNREFUSED
+      Put.error "cdn.subutai.io:8338 connection refused"
+    rescue Errno::EHOSTUNREACH
+      Put.error "cdn.subutai.io:8338 unreachable"
+    rescue => e
+      Put.error e
     end
   end
 end

data/lib/vagrant-subutai/rest/gorjun.rb

@@ -20,8 +20,8 @@ module VagrantSubutai
           when Net::HTTPOK
             response = JSON.parse(response.body)
             response[0]['id']
-          else
-            Put.error "Try again! #{response.body} template name #{name}, owner #{owner}"
+          when Net::HTTPNotFound
+            Put.error "#{response.body} template name #{name}, owner #{owner}"
         end
       end
 

data/lib/vagrant-subutai/rest/subutai_console.rb

@@ -53,6 +53,18 @@ module VagrantSubutai
         https.request(request)
       end
 
+      def self.deregister(token, url)
+        uri = URI.parse(url + Configs::SubutaiConsoleAPI::V1::DE_REGISTER_HUB + token)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        https.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        https.read_timeout = 3600 # an hour
+
+        request = Net::HTTP::Delete.new(uri.request_uri)
+
+        https.request(request)
+      end
+
       # Approves Resource Host
       def self.approve(token, url, id)
         uri = URI.parse(url + Configs::SubutaiConsoleAPI::V1::APPROVE + "/#{id}/approve?sptoken?=" + token)

data/lib/vagrant-subutai/subutai_commands.rb

@@ -67,6 +67,32 @@ module VagrantSubutai
       end
     end
 
+    def deregister(username, password, url)
+      if registered?(url)
+          username, password = get_input_token if username.nil? || password.nil?
+
+          response = Rest::SubutaiConsole.token(url, username, password)
+
+          case response
+            when Net::HTTPOK
+
+              response = Rest::SubutaiConsole.deregister(response.body, url)
+
+              case response
+                when Net::HTTPOK
+                  Put.success response.body
+                  Put.success "Successfully PeerOS deregistered from Bazaar."
+                else
+                  Put.error "Error: #{response.body}\n"
+              end
+            else
+              Put.error "Error: #{response.body}\n"
+          end
+      else
+        Put.warn "The PeerOs not registered to Bazaar"
+      end
+    end
+
     # register Subutai Peer Os to Bazaar by username and password
     def register(username, password, url)
       if registered?(url)

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-subutai
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Subutai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-30 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler