occi-cli 4.3.9 → 4.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d514c601aafd16b93f02d405c5a6040fd1d6cc65
-  data.tar.gz: 5d5ed74ecc16de22e0162183cade0f6880313001
+  metadata.gz: 1dc9e04fbc0cf3293ecc5e3ae56059ee6e67ce15
+  data.tar.gz: 25ed180e7eb9d0d45a1a94a1d6c2b18377f35178
 SHA512:
-  metadata.gz: 740921fa7ba5e6b0bb0dc93ddba8f890a7a94766128295655247da436e7986c83d8c1f092318de2e5f44f8966468601e899c79af3619c79c675ef606aedcc771
-  data.tar.gz: dae114bc9c927dc6bb91d30f1a404aa0e61f2e2eeac4e47db85e2498be9bdb063727686bc097d1ac308614876af41ba83ef12a498cc29cef44b4b00b02690bbd
+  metadata.gz: 7e6caa69e122d0c2523162fa8fa2810958c94f0aa8672941e90253c316c614b0fffacf9f74b4165f5350e3635a64e45ae1a337e75c7e7935a4928fc98d51edcf
+  data.tar.gz: 5cea0e261d4276af9ad2a401b31bef4a7f0f70afb480fb5c818ecf5df85c725fb7f7e1a3fb3ddeb296d7b31421fed060cf1e5336b6eca561e436ac6eac5a66c3

data/bin/occi

@@ -21,7 +21,7 @@ require 'highline/import'
 
 require 'occi-cli'
 
-NONPASS_AUTHS = %w(none token).freeze
+NONPASS_AUTHS = %w(none token oauth2).freeze
 
 # get arguments and validate/parse them to an ostruct
 options = Occi::Cli::OcciOpts.parse ARGV

data/lib/occi/cli/helpers/create_helper.rb

@@ -82,6 +82,11 @@ module Occi::Cli::Helpers::CreateHelper
       elsif link.include? "/network/"
         Occi::Cli::Log.debug "Adding networkinterface to #{options.resource.inspect}"
         res.networkinterface link
+      elsif link.include? "/securitygroup/"
+        Occi::Cli::Log.debug "Adding securitygrouplink to #{options.resource.inspect}"
+        kind = 'http://schemas.ogf.org/occi/infrastructure#securitygrouplink'
+        sec_grp_kind = 'http://schemas.ogf.org/occi/infrastructure#securitygroup'
+        res.link link, kind, [], Occi::Core::Attributes.new, sec_grp_kind
       else
         raise "Unknown link type #{link.inspect}, stopping here!"
       end

data/lib/occi/cli/helpers/link_helper.rb

@@ -28,12 +28,15 @@ module Occi::Cli::Helpers::LinkHelper
     raise "No valid links given!" if link.blank?
 
     case link
-    when /\/network\//
+    when /\/network\//, /\/ipreservation\//
       link_kind = model.get_by_id("http://schemas.ogf.org/occi/infrastructure#networkinterface")
       raise "#{options.endpoint.inspect} does not support networkinterface links!" unless link_kind
     when /\/storage\//
       link_kind = model.get_by_id("http://schemas.ogf.org/occi/infrastructure#storagelink")
       raise "#{options.endpoint.inspect} does not support storagelink links!" unless link_kind
+    when /\/securitygroup\//
+      link_kind = model.get_by_id("http://schemas.ogf.org/occi/infrastructure#securitygrouplink")
+      raise "#{options.endpoint.inspect} does not support securitygroup links!" unless link_kind
     else
       raise "Unknown link target #{link.inspect}! Only network and storage targets are supported!"
     end
@@ -76,4 +79,4 @@ module Occi::Cli::Helpers::LinkHelper
     end
   end
 
-end
+end

data/lib/occi/cli/occi_opts.rb

@@ -9,7 +9,7 @@ module Occi::Cli
 
   class OcciOpts
 
-    AUTH_METHODS = [:x509, :token, :basic, :digest, :none].freeze
+    AUTH_METHODS = [:x509, :token, :basic, :digest, :oauth2, :none].freeze
     MEDIA_TYPES = ["application/occi+json", "text/plain,text/occi", "text/plain", "text/occi"].freeze
     ACTIONS = [:list, :describe, :create, :delete, :trigger, :link, :unlink, :discover, :update].freeze
     LOG_OUTPUTS = [:stdout, :stderr].freeze

data/lib/occi/cli/version.rb

@@ -1,5 +1,5 @@
 module Occi
   module Cli
-    VERSION = "4.3.9" unless defined?(::Occi::Cli::VERSION)
+    VERSION = "4.3.10" unless defined?(::Occi::Cli::VERSION)
   end
 end

data/occi-cli.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_dependency 'occi-api', '>= 4.3.11', '< 5'
+  gem.add_dependency 'occi-api', '>= 4.3.14', '< 5'
   gem.add_dependency 'json', '>= 1.8.1', '< 3'
   gem.add_dependency 'highline', '>= 1.6.21', '< 2'
   gem.add_dependency 'activesupport', '>= 4.0.0', '< 5'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: occi-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.9
+  version: 4.3.10
 platform: ruby
 authors:
 - Florian Feldhaus
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-14 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: occi-api
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.11
+        version: 4.3.14
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -28,7 +28,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.3.11
+        version: 4.3.14
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -326,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Executable OCCI client