enfcli 3.12.0.pre.alpha → 3.13.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f979f06a9f25dad8887fc5260713707ad3c868dec6ce41b9e1b5abe90a6191c6
-  data.tar.gz: ccb74ba53cd0b5dd3762057cc4999163efeee366bf6cb7d57b070830b3b786a3
+  metadata.gz: 522440e411980f0f45893f8e062e68dbfe53e0f1c322cc6dcd3b41a4b37b1546
+  data.tar.gz: a29c99ae3bada808e496be1da3c27746fa5e53d01c8fbe02796a97c62220c680
 SHA512:
-  metadata.gz: 5329e56ea4089c3421c5f23607f992017d88bccf96080a4b44f6b97ccad0e70f2d110f767cda0210704d06191d697e504613509a30c4b3a9adb5cd7ea16cc994
-  data.tar.gz: 4bd293cd5e9d96b23833bc95736811ef853cff7c96c52c4f7d246dd46b53fb94e8a6783b2e6b418f98c6cb1f18eca1016633a9217d0b6fe401fa304837e7aeab
+  metadata.gz: 4890b71f648e7a082f63f0861e36c11147d5c863767d49e69f3bb4e11c6ba9fe1928f32932a53a71a87f81c3371fbc8981a463f9044865a086107efc5cf3f50f
+  data.tar.gz: b814bcef370608ad93f4248eacca7254be81f0e9a93855fd6bd4bade190eb828bca7b016ccfb3996fa7c5e03158bf08370d221d9f120b6a9ffec27c9d1cfd44a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enfcli (3.12.0.pre.alpha)
+    enfcli (3.13.0.pre.alpha)
       rest-client (~> 2.0)
       terminal-table
       thor (~> 0.20.0)

data/lib/enfapi.rb

@@ -17,7 +17,6 @@ require 'rest-client'
 require 'singleton'
 require 'json'
 require 'date'
-require 'base64'
 require 'cgi'
 
 #
@@ -588,7 +587,6 @@ module EnfApi
     def api_error_msg(err)
       if err.key?(:xiam_error)
         reason = err[:reason]
-        reason = Base64.decode64(reason)
         "#{reason}"
       elsif err.key?(:error)
         code = err[:error][:code]

data/lib/enfcli/commands/xiam.rb

@@ -15,7 +15,6 @@
 #
 require 'enfthor'
 require 'enfapi'
-require 'base64'
 require 'digest'
 require 'openssl'
 require 'ipaddr'
@@ -101,14 +100,13 @@ module EnfCli
 
         def display_groups groups
           headings = ['DAA Group', 'Base Name', 'Provisioned', 'Onboarded', 'Default Network', 'Domain' ]
-          say groups
           rows = groups.map{ |hash|
-            [ Base64.decode64(hash[:gid]).unpack("H*")[0],
-              Base64.decode64(hash[:basename]),
+            [ hash[:gid],
+              hash[:basename],
               hash[:provisioned_count],
               hash[:onboarded_count],
-              hash[:default_network] ? "#{IPAddr::new_ntoh( Base64.decode64(hash[:default_network][:prefix]) )}/#{hash[:default_network][:prefix_length]}" : '<not set>',
-              "#{IPAddr::new_ntoh( Base64.decode64(hash[:domain][:prefix]) )}/#{hash[:domain][:prefix_length]}",
+              hash[:default_network] ? hash[:default_network] : '<not set>',
+              hash[:domain],
             ]
           }
           render_table(headings, rows)
@@ -116,8 +114,7 @@ module EnfCli
 
         def provision_endpoint(ipv6_address, pub)
           # encode public key
-          hex = pub.to_bn.to_s(16)
-          pubkey = Base64.strict_encode64([hex].pack("H*"))
+          pubkey = pub.to_bn.to_s(16)
 
           # create NEW_CREDENTIAL_ECDSA
           new_credential = {
@@ -132,7 +129,7 @@ module EnfCli
                 :ecdsa_credential => new_credential,
                 :address_request => {
                   :address_request_oneof => {
-                    :address => Base64.strict_encode64( ipv6_address.hton )
+                    :address => ipv6_address.to_s
                   }
                 }
               }
@@ -141,18 +138,16 @@ module EnfCli
 
           data = EnfApi::Iam.instance.provision_endpoint new_endpoint
           provisioned_ip = data[:address]
-          provisioned_ip = EnfCli::IPV6::ntoh Base64.decode64(provisioned_ip)
 
           # Make sure provisioned ip is same as the requested ip
-          raise EnfCli::ERROR, "Hello World" unless provisioned_ip.to_s.eql?( ipv6_address.to_s )
+          raise EnfCli::ERROR, "Provisioned IPv6 address not the same as requested" unless provisioned_ip.eql?( ipv6_address.to_s )
           
           say "Created new ipv6 endpoint #{provisioned_ip}", :green
         end
 
         def update_endpoint_credentials(ipv6_address, pub)
           # encode public key
-          hex = pub.to_bn.to_s(16)
-          pubkey = Base64.strict_encode64([hex].pack("H*"))
+          pubkey = pub.to_bn.to_s(16)
 
           # create NEW_CREDENTIAL_ECDSA
           new_credential = {
@@ -187,10 +182,7 @@ module EnfCli
             gid = scan_gid
           end
 
-          # url safe encode gid
-          enc_gid = Base64.urlsafe_encode64([gid].pack("H*"))
-
-          data = EnfApi::Iam.instance.get_group enc_gid
+          data = EnfApi::Iam.instance.get_group gid
           groups = [data]
 
           # display data
@@ -230,7 +222,7 @@ module EnfCli
       method_option *option_gid
       def set_group_default_network
         try_with_rescue_in_session do
-          network = EnfCli::IPV6Cidr.new options[:network]
+          network = EnfCli::IPV6Cidr.new(options[:network]).to_s
 
           # scan if gid not in options
           if options[:gid]
@@ -239,23 +231,14 @@ module EnfCli
             gid = scan_gid
           end
 
-          # create IPV6_NETWORK
-          ipv6_network = {
-            :prefix => Base64.strict_encode64( network.prefix_bytes ),
-            :prefix_length => network.prefix_len
-          }
-
           # create MODIFIED_GROUP
           modified_group = {
-            :gid => Base64.strict_encode64([gid].pack("H*")),
-            :default_network => ipv6_network
+            :gid => gid,
+            :default_network => network
           }
 
-          # url safe encode gid
-          enc_gid = Base64.urlsafe_encode64([gid].pack("H*"))
-
           # Post to server
-          EnfApi::Iam.instance.update_group enc_gid, modified_group
+          EnfApi::Iam.instance.update_group gid, modified_group
 
           say "Set #{network} as default network for group #{gid}", :green
         end
@@ -266,7 +249,7 @@ module EnfCli
       method_option *option_gid
       def set_group_domain
         try_with_rescue_in_session do
-          domain_network = EnfCli::IPV6Cidr.new options[:domain]
+          domain = EnfCli::IPV6Cidr.new(options[:domain]).to_s
 
           # scan if gid not in options
           if options[:gid]
@@ -275,25 +258,16 @@ module EnfCli
             gid = scan_gid
           end
 
-          # create IPV6_NETWORK
-          ipv6_network = {
-            :prefix => Base64.strict_encode64( domain_network.prefix_bytes ),
-            :prefix_length => domain_network.prefix_len
-          }
-
           # create MODIFIED_GROUP
           modified_group = {
-            :gid => Base64.strict_encode64([gid].pack("H*")),
-            :domain => ipv6_network
+            :gid => gid,
+            :domain => domain
           }
 
-          # url safe encode gid
-          enc_gid = Base64.urlsafe_encode64([gid].pack("H*"))
-
           # Post to server
-          EnfApi::Iam.instance.update_group enc_gid, modified_group
+          EnfApi::Iam.instance.update_group gid, modified_group
 
-          say "Associated group #{gid} with #{domain_network}", :green
+          say "Associated group #{gid} with #{domain}", :green
         end
       end
 
@@ -303,7 +277,7 @@ module EnfCli
       method_option :'set_as_default', :type => :boolean, default: false, desc: "Set the network as the default for this group"
       def add_group_to_network
         try_with_rescue_in_session do
-          network = EnfCli::IPV6Cidr.new options[:network]
+          network = EnfCli::IPV6Cidr.new(options[:network]).to_s
 
           # scan if gid not in options
           if options[:gid]
@@ -312,25 +286,16 @@ module EnfCli
             gid = scan_gid
           end
 
-          # create IPV6_NETWORK
-          ipv6_network = {
-            :prefix => Base64.strict_encode64( network.prefix_bytes ),
-            :prefix_length => network.prefix_len
-          }
-
-          # url safe encode gid
-          enc_gid = Base64.urlsafe_encode64([gid].pack("H*"))
-
           if options[:set_as_default]
             modified_group = {
-              :gid => Base64.strict_encode64([gid].pack("H*")),
-              :default_network => ipv6_network
+              :gid => gid,
+              :default_network => network
             }
 
-            EnfApi::Iam.instance.update_group enc_gid, modified_group
+            EnfApi::Iam.instance.update_group gid, modified_group
             say "Associated group #{gid} with #{network} as default network", :green
           else
-            EnfApi::Iam.instance.add_group_to_network enc_gid, ipv6_network
+            EnfApi::Iam.instance.add_group_to_network gid, network
             say "Associated group #{gid} with #{network}", :green
           end
         end
@@ -355,22 +320,17 @@ module EnfCli
           operator = options.operator.join(" ").gsub(/\A"+(.*?)"+\Z/m, '\1')
           quantity = options[:'device-count']
 
-          # 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*"))
-
           # create NEW_PROVISIONING
           new_provisioning = {
-            :group_id => enc_gid,
+            :group_id => gid,
             :quantity => quantity,
             :operator => operator
           }
 
           # create NEW_GROUP
           new_group = {
-            :group_public_key => enc_gpk,
-            :basename => enc_basename,
+            :group_public_key => gpk,
+            :basename => basename,
             :provisionings => [ new_provisioning ]
           }
             
@@ -432,7 +392,7 @@ module EnfCli
       def create_endpoint_in_network
         try_with_rescue_in_session do
           # Read options
-          network = EnfCli::IPV6Cidr.new options[:network]
+          network = EnfCli::IPV6Cidr.new(options[:network]).to_s
           keyfile = EnfCli::expand_path(options['public-key-in-file'])
 
           # read keyfile
@@ -440,8 +400,7 @@ module EnfCli
 
           # encode public key
           pub = key.public_key
-          hex = pub.to_bn.to_s(16)
-          pubkey = Base64.strict_encode64([hex].pack("H*"))
+          pubkey = pub.to_bn.to_s(16)
 
           # create NEW_CREDENTIAL_ECDSA
           new_credential = {
@@ -449,12 +408,6 @@ module EnfCli
             :key => pubkey
           }
           
-          # create IPV6_NETWORK
-          ipv6_network = {
-            :prefix => Base64.strict_encode64( network.prefix_bytes ),
-            :prefix_length => network.prefix_len
-          }
-
           # create NEW_ENDPOINT_AUTH
           new_endpoint = {
             :cred_oneof => {
@@ -462,7 +415,7 @@ module EnfCli
                 :ecdsa_credential => new_credential,
                 :address_request => {
                   :address_request_oneof => {
-                    :network => ipv6_network
+                    :network => network
                   }
                 }
               }
@@ -471,7 +424,6 @@ module EnfCli
 
           data = EnfApi::Iam.instance.provision_endpoint new_endpoint
           provisioned_ip = data[:address]
-          provisioned_ip = EnfCli::IPV6::ntoh Base64.decode64(provisioned_ip)
           
           say "Created new ipv6 endpoint #{provisioned_ip}", :green
         end

data/lib/enfcli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 3.12.0.pre.alpha
+  version: 3.13.0.pre.alpha
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor