enfcli 3.8.6.pre.alpha → 3.9.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd44dc015e746db79cdd90f494cc2e468ec3c4e8ce778de93d6ebf890d32cbca
-  data.tar.gz: 0a93e319fa5e5efad44626abaa07a12f2e9339fa49479be5f5731ac31c99fd90
+  metadata.gz: f5a105c81c7f42c28b274f00d6bf3899db3eb4d339bbd9fb013b46b2efbc189e
+  data.tar.gz: 7e3c5c91683c9f414d1b35da725fee523ab9c5497c1f00aa7645cc0609114b6e
 SHA512:
-  metadata.gz: 8fffba329c28bb08c2f058b50d349880047af1778bdbdea9107547d0e4fd0ef10c4c5f38bc699b99ea80ae1886004ee47d3288987df55473e9cc0c8d691955ab
-  data.tar.gz: 12911e5091de82ff4605a24afbacff93da59ea11b7ed3f4d057ce58acfd8e5aadfab49f114639fb8b19a06cb4f65f3d7b76436c8c4de7742ddaee37957af17a2
+  metadata.gz: 2a6746f422f5f694ca03934c834fc524f51d355b45645e0c01a13b3fa4ef1ccbc5861b5743225d9d0f4c86689956df23ca91f4235daf39c9f3e5843d319b1b79
+  data.tar.gz: f602019955f342a70e5890b1a461eb89233a63986e558b0740680411d6cf84cd26f692c981e45ecd7e5ea815607f9b12e978881ef1d778a1d8fa40cc20ecd0b3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enfcli (3.8.6.pre.alpha)
+    enfcli (3.9.0.pre.alpha)
       rest-client (~> 2.0)
       terminal-table
       thor (~> 0.20.0)
@@ -24,9 +24,9 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     netrc (0.11.0)
     public_suffix (3.0.3)
     rake (10.5.0)

data/lib/enfapi.rb

@@ -167,10 +167,17 @@ module EnfApi
     end
 
     ## NO_TEST
-    def list_group(gid)
+    def get_group(gid)
       EnfApi::API.instance.get "/api/xiam/v1/groups/#{gid}"
     end
 
+    ## NO_TEST
+    def list_groups(network = nil)
+      url = "/api/xiam/v1/groups"
+      url = "#{url}?network=#{network}" if network
+      EnfApi::API.instance.get url
+    end
+
     ## NO_TEST
     def provision_endpoint(new_endpoint)
       json = EnfApi::to_json(new_endpoint)

data/lib/enfcli/commands/xiam.rb

@@ -32,14 +32,14 @@ module EnfCli
           # Write to file
           if write_to_file keyfile, data
             say "Created #{keyfile}", :green
-          end          
+          end
         end
-        
+
         def write_to_file filename, data
           begin
             # check if file exists
-            filename = EnfCli::expand_path(filename)            
-            if File.exists?( filename ) 
+            filename = EnfCli::expand_path(filename)
+            if File.exists?( filename )
               proceed = ask("Overwrite #{filename}(type 'yes' to continue...)?")
               return nil unless (proceed.downcase == 'yes')
             end
@@ -76,6 +76,18 @@ module EnfCli
           gpk_info
         end
 
+        def scan_gid()
+          qr_code_info = scan_group_qr_code()
+
+          # Extract gpk and basename
+          gpk_info = qr_code_info.split(",")
+          basename = gpk_info[0]
+          gpk = gpk_info[1]
+
+          # Calculate gid
+          calculate_gid basename, gpk
+        end
+
         def read_ec_key_file(keyfile)
           # expand path
           keyfile = EnfCli::expand_path(keyfile)
@@ -157,52 +169,72 @@ module EnfCli
         end
       }
 
-      desc "list-group", "List DAA Group Information"
-      def list_group
-        try_with_rescue_in_session do
-          qr_code_info = scan_group_qr_code()
+      option_gid = [:gid, {default: nil, type: :string, banner: 'GID',
+                           desc: 'The group to get. If not specified, scan the group QR code'}]
 
-          # Extract gpk and basename
-          gpk_info = qr_code_info.split(",")
-          basename = gpk_info[0]
-          gpk = gpk_info[1]
-          
-          # Calculate gid
-          gid = calculate_gid basename, gpk
+      desc "get-group", "Get DAA Group Information"
+      method_option *option_gid
+      def get_group
+        try_with_rescue_in_session do
+          # scan if gid not in options
+          if options[:gid]
+            gid = options[:gid]
+          else
+            gid = scan_gid
+          end
 
           # url safe encode gid
           enc_gid = Base64.urlsafe_encode64([gid].pack("H*"))
 
-          data = EnfApi::Iam.instance.list_group enc_gid
+          data = EnfApi::Iam.instance.get_group enc_gid
           groups = [data]
-          
+
           # display data
           display_groups groups
         end
       end
 
+      desc "list-groups", "List DAA Groups Information"
+      method_option :'network', default: nil, type: :string, banner: 'NETWORK',
+                                desc: 'List only groups in this network'
+      def list_groups
+        try_with_rescue_in_session do
+          # The xiam API doesn't properly support the 'network' query
+          # parameter for listing groups. Until that is fixed, use the
+          # /network/N/groups resource instead.
+          #
+          # See https://github.com/xaptum/xiam/issues/54
+          #
+          if options[:network]
+            # validate network
+            network = EnfCli::IPV6Cidr.new options[:network]
+
+            # call the api
+            data = EnfApi::Iam.instance.list_network_groups network.to_s
+          else
+            # call the api
+            data = EnfApi::Iam.instance.list_groups
+          end
+
+          groups = data[:body]
+          display_groups groups
+        end
+      end
+
       desc "set-group-default-network", "Set /64 network as default for the DAA group"
       method_option :'network', :type => :string, :required => true
-      method_option :'gid', :type => :string
+      method_option *option_gid
       def set_group_default_network
         try_with_rescue_in_session do
           network = EnfCli::IPV6Cidr.new options[:network]
 
           # scan if gid not in options
-          if options[:gid] 
+          if options[:gid]
             gid = options[:gid]
           else
-            qr_code_info = scan_group_qr_code()
-
-            # Extract gpk and basename
-            gpk_info = qr_code_info.split(",")
-            basename = gpk_info[0]
-            gpk = gpk_info[1]
-
-            # Calculate gid
-            gid = calculate_gid basename, gpk
+            gid = scan_gid
           end
-          
+
           # create IPV6_NETWORK
           ipv6_network = {
             :prefix => Base64.strict_encode64( network.prefix_bytes ),
@@ -223,30 +255,22 @@ module EnfCli
 
           say "Set #{network} as default network for group #{gid}", :green
         end
-      end      
+      end
 
       desc "set-group-domain", "Set /48 domain for the DAA group"
       method_option :'domain', :type => :string, :required => true
-      method_option :'gid', :type => :string
+      method_option *option_gid
       def set_group_domain
         try_with_rescue_in_session do
           domain_network = EnfCli::IPV6Cidr.new options[:domain]
 
           # scan if gid not in options
-          if options[:gid] 
+          if options[:gid]
             gid = options[:gid]
           else
-            qr_code_info = scan_group_qr_code()
-
-            # Extract gpk and basename
-            gpk_info = qr_code_info.split(",")
-            basename = gpk_info[0]
-            gpk = gpk_info[1]
-
-            # Calculate gid
-            gid = calculate_gid basename, gpk
+            gid = scan_gid
           end
-          
+
           # create IPV6_NETWORK
           ipv6_network = {
             :prefix => Base64.strict_encode64( domain_network.prefix_bytes ),
@@ -271,26 +295,18 @@ module EnfCli
 
       desc "add-group-to-network", "Associate a DAA Group with /64 network"
       method_option :'network', :type => :string, :required => true
-      method_option :'gid', :type => :string
+      method_option *option_gid
       def add_group_to_network
         try_with_rescue_in_session do
           network = EnfCli::IPV6Cidr.new options[:network]
 
           # scan if gid not in options
-          if options[:gid] 
+          if options[:gid]
             gid = options[:gid]
           else
-            qr_code_info = scan_group_qr_code()
-
-            # Extract gpk and basename
-            gpk_info = qr_code_info.split(",")
-            basename = gpk_info[0]
-            gpk = gpk_info[1]
-
-            # Calculate gid
-            gid = calculate_gid basename, gpk
+            gid = scan_gid
           end
-          
+
           # create IPV6_NETWORK
           ipv6_network = {
             :prefix => Base64.strict_encode64( network.prefix_bytes ),
@@ -329,7 +345,7 @@ module EnfCli
           # base64 encode all binary data: basename, gpk, gid
           enc_basename = Base64.strict_encode64([basename].pack("H*"))
           enc_gpk = Base64.strict_encode64([gpk].pack("H*"))
-          enc_gid = Base64.strict_encode64([gid].pack("H*"))          
+          enc_gid = Base64.strict_encode64([gid].pack("H*"))
 
           # create NEW_PROVISIONING
           new_provisioning = {
@@ -353,22 +369,6 @@ module EnfCli
         end
       end
 
-      desc "list-network-groups", "List all DAA groups associated with a /64 network"
-      method_option :'network', :type => :string, :required => true
-      def list_network_groups
-        try_with_rescue_in_session do
-          # validate network
-          network = EnfCli::IPV6Cidr.new options[:network]
-          
-          # call the api
-          data = EnfApi::Iam.instance.list_network_groups network.to_s
-          groups = data[:body]
-
-          # display data
-          display_groups groups
-        end
-      end
-
       desc "create-endpoint-key", "Generate a pem encoded EC key pair"
       method_option :'key-out-file', :type => :string, :required => true, :banner => '<file>'
       method_option :'public-key-out-file', :type => :string, :required => true, :banner => '<file>'

data/lib/enfcli/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 module EnfCli
-  VERSION = '3.8.6-alpha'
+  VERSION = '3.9.0-alpha'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 3.8.6.pre.alpha
+  version: 3.9.0.pre.alpha
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-04 00:00:00.000000000 Z
+date: 2019-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor