enfcli 3.3.4 → 3.4.0.pre.alpha

data/lib/enfcli/commands/xdns.rb

@@ -0,0 +1,446 @@
+#
+# Copyright 2019 Xaptum,Inc
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+require 'enfthor'
+require 'enfapi'
+
+module EnfCli
+  module Cmd
+
+    class Xdns < EnfThor
+      DnsRecordType_AAAA = 'AAAA'
+      DnsRecordType_TXT = 'TXT'
+      DnsRecordType_SRV = 'SRV'
+      DnsRecordType_CNAME = 'CNAME'
+      DnsRecordTypes = [DnsRecordType_AAAA, DnsRecordType_CNAME, DnsRecordType_SRV, DnsRecordType_TXT]
+
+      no_commands {
+        def array_option_to_string(arr)
+          arr.join(" ").gsub(/\A"+(.*?)"+\Z/m, '\1')
+        end
+
+        def get_record_value(type, value)
+          case type
+          when DnsRecordType_AAAA
+            value = value[:ipv6]
+
+          when DnsRecordType_CNAME
+            value = value[:dname]
+
+          when DnsRecordType_SRV
+            value = "#{value[:priority]} #{value[:weight]} #{value[:port]} #{value[:target]}"
+
+          when DnsRecordType_TXT
+            value = value[:txt]
+          end
+
+          value
+        end
+
+        def display_zones_table(zones)
+          headings = ['Id', 'Zone', 'Description', 'Enf Domain']
+          rows = zones.map{ |hash|
+            [ hash[:id], hash[:zone_domain_name], hash[:description], hash[:enf_domain] ]
+          }
+          render_table(headings, rows)
+        end
+
+        def display_networks_table(networks)
+          headings = ['Id', 'Network' ]
+          rows = networks.map{ |hash|
+            [ hash[:rowid], hash[:enf_network] ]
+          }
+          render_table(headings, rows)
+        end
+
+        def display_records_table(records)
+          headings = ['Id', 'Name', 'Type', 'Value', 'TTL']
+          rows = records.map{ |hash|
+            [ hash[:id], hash[:name], hash[:type], get_record_value(hash[:type], hash[:value]), hash[:ttl] ]
+          }
+          render_table(headings, rows)
+        end
+
+        def display_servers_table(servers)
+          headings = ['Id', 'IPv6', 'Network', 'Description' ]
+          rows = servers.map{ |hash|
+            [ hash[:id], hash[:ipv6], hash[:enf_network], hash[:description] ]
+          }
+          render_table(headings, rows)
+        end
+      }
+
+      desc "create-zone", "Create DNS Zone"
+      method_option :'zone-domain-name', :type => :string, :required => true
+      method_option :description, :type => :array, :banner => "DESCRIPTION"
+      method_option :'enf-domain', :type => :string, :banner => "/48 Enf Domain"
+      def create_zone
+        try_with_rescue_in_session do
+          ## session
+          session = EnfCli::CTX.instance.session
+
+          ## Gather parameters
+          zone_domain_name = options['zone-domain-name']
+          description = array_option_to_string(options.description) if options.description
+          case session[:type]
+          when 'XAPTUM_ADMIN'
+            enf_domain = options['enf-domain']
+            raise "No value provided for required options '--enf-domain'" unless enf_domain
+
+          else
+            enf_domain = session[:domain_network]
+          end
+
+          ## create request hash
+          new_zone = {
+            :zone_domain_name => zone_domain_name,
+            :description => description,
+            :enf_domain => enf_domain
+          }
+
+          ## call api
+          data = EnfApi::Dns.instance.create_dns_zone new_zone
+          zones = data[:data]
+
+          ## display success
+          say "Created DNS zone #{zone_domain_name}!", :green
+
+          display_zones_table zones
+        end
+      end
+
+      desc "list-zones", "List DNS Zones"
+      method_option :'enf-domain', :type => :string, :banner => "/48 Enf Domain"
+      def list_zones
+        try_with_rescue_in_session do
+          ## session
+          session = EnfCli::CTX.instance.session
+
+          case session[:type]
+          when 'XAPTUM_ADMIN'
+            enf_domain = options['enf-domain']
+            raise "No value provided for required options '--enf-domain'" unless enf_domain
+
+          else
+            enf_domain = session[:domain_network]
+          end
+
+          ## call api
+          data = EnfApi::Dns.instance.list_zones enf_domain
+          zones = data[:data]
+
+          ## display table
+          display_zones_table zones
+        end
+      end
+
+      desc "delete-zone", "Delete a DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      def delete_zone
+        try_with_rescue_in_session do
+          zone_id = options[:'zone-id']
+          ## call api
+          EnfApi::Dns.instance.delete_dns_zone zone_id
+
+          ## print success
+          say "Deleted DNS Zone with id: #{zone_id}", :green
+        end
+      end
+
+      desc "update-zone", "Update a DNS zone description"
+      method_option :'zone-id', :type => :string, :required => true
+      method_option :description, :type => :array, :banner => "DESCRIPTION", :required => true
+      def update_zone
+        try_with_rescue_in_session do
+          ## get parameters
+          description = array_option_to_string(options.description) if options.description
+
+          ## update request
+          update_zone_req = {
+            :description => description
+          }
+
+          ## call api
+          data = EnfApi::Dns.instance.update_dns_zone options[:'zone-id'], update_zone_req
+          zones = data[:data]
+
+          ## display updated result
+          display_zones_table zones
+        end
+      end
+
+      desc "add-networks-to-zone", "Add /64 networks to DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+      def add_networks_to_zone
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+          networks = array_option_to_string(options[:networks]).split(",").map{ |x| x.strip }
+
+          ## add networks request
+          add_networks_req = {
+            :networks => networks
+          }
+
+          ## call api
+          data = EnfApi::Dns.instance.add_networks_to_zone zone_id, add_networks_req
+          networks = data[:data]
+
+          ## display data
+          say "Added the following networks to zone with id: #{zone_id}", :green
+          display_networks_table networks
+        end
+      end
+
+      desc "list-networks-in-zone", "List /64 networks in DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      def list_networks_in_zone
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+
+          ## call api
+          data = EnfApi::Dns.instance.list_networks_in_zone zone_id
+          networks = data[:data]
+
+          ## display data
+          display_networks_table networks
+        end
+      end
+
+      desc "delete-networks-from-zone", "Delete /64 networks from DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+      def delete_networks_from_zone
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+          networks = array_option_to_string(options[:networks])
+
+          ## call api
+          EnfApi::Dns.instance.delete_networks_from_zone zone_id, networks
+
+          ## print success
+          say "Deleted networks from DNS zone!", :green
+        end
+      end
+
+      desc "replace-networks-in-zone", "Replace /64 networks in DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      method_option :networks, :type => :array, :banner => "NETWORKS", :required => true
+      def replace_networks_in_zone
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+          networks = array_option_to_string(options[:networks]).split(",").map{ |x| x.strip }
+
+          ## replace networks request
+          replace_networks_req = {
+            :networks => networks
+          }
+
+          ## call api
+          EnfApi::Dns.instance.replace_networks_in_zone zone_id, replace_networks_req
+
+          ## print success
+          say "Replaced networks in DNS zone!", :green
+        end
+      end
+
+      desc "list-zones-in-network", "List DNS Zones in /64 Network"
+      method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+      def list_zones_in_network
+        try_with_rescue_in_session do
+          ## gather parameters
+          network = options[:network]
+
+          ## call api
+          data = EnfApi::Dns.instance.list_zones_in_network network
+          zones = data[:data]
+
+          ## display data
+          display_zones_table zones
+        end
+      end
+
+      desc "create-record", "Create a DNS record"
+      method_option :'zone-id', :type => :string, :required => true
+      method_option :name, :type => :string, :required => true
+      method_option :'type',  :type => :string, :required => true, :enum => DnsRecordTypes
+      method_option :ttl, :type => :numeric, :required => true
+      method_option :value, :type => :array, :required => true, :banner => 'VALUE'
+      def create_record
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+          name = options[:name]
+          type = options[:type]
+          ttl = options[:ttl]
+          value = array_option_to_string(options.value)
+
+          ## get value
+          case type
+          when DnsRecordType_AAAA
+            ipv6 = EnfCli::IPV6.new(value).to_s
+            value = { :ipv6 => ipv6 }
+
+          when DnsRecordType_CNAME
+            value = { :dname => value }
+
+          when DnsRecordType_SRV
+            raise "Invalid value for #{DnsRecordType_SRV} record" unless options.value.length == 4
+            value = { :priority => Integer(options.value[0]),
+                      :weight => Integer(options.value[1]),
+                      :port => Integer(options.value[2]),
+                      :target => options.value[3],
+                    }
+
+          when DnsRecordType_TXT
+            value = { :txt => value }
+          end
+
+
+
+          new_record = {
+            :name => name,
+            :type => type,
+            :ttl => ttl,
+            :value => value
+          }
+
+          ## call api
+          data = EnfApi::Dns.instance.create_dns_record zone_id, new_record
+          records = data[:data]
+
+          ## display table
+          say "Created new DNS record!", :green
+          display_records_table records
+        end
+      end
+
+      desc "list-records", "List DNS records in a DNS zone"
+      method_option :'zone-id', :type => :string, :required => true
+      def list_records
+        try_with_rescue_in_session do
+          ## gather parameters
+          zone_id = options[:'zone-id']
+
+          ## call api
+          data = EnfApi::Dns.instance.list_dns_records zone_id
+          records = data[:data]
+
+          ## display table
+          display_records_table records
+        end
+      end
+
+      desc "query", "Query DNS for a record"
+      method_option :'network', :type => :string, :required => true, :banner => "/64 Enf Network"
+      method_option :name, :type => :string, :required => true
+      method_option :'type',  :type => :string, :required => true, :enum => DnsRecordTypes
+      def query
+        try_with_rescue_in_session do
+          ## gather parameters
+          network = options[:network]
+          name = options[:name]
+          type = options[:type]
+
+          ## call api
+          data = EnfApi::Dns.instance.query network, type, name
+          records = data[:data]
+
+          ## display table
+          display_records_table records
+        end
+      end
+
+      desc "delete-record", "Delete a DNS record"
+      method_option :'id', :type => :string, :required => true
+      def delete_record
+        try_with_rescue_in_session do
+          ## gather parameters
+          id = options[:id]
+
+          ## call api
+          EnfApi::Dns.instance.delete_dns_record id
+
+          ## print success
+          say "Deleted DNS record!", :green
+        end
+      end
+
+      desc "provision-server", "Provision a DNS server in /64 network"
+      method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+      method_option :'ipv6', :type => :string
+      method_option :description, :type => :array, :banner => "DESCRIPTION"
+      def provision_server
+        try_with_rescue_in_session do
+          ## gather parameters
+          network = options[:network]
+          description = array_option_to_string(options.description) if options.description
+          ipv6 = options[:ipv6]
+
+          new_server = {
+            :ipv6 => ipv6,
+            :description => description
+          }
+
+          ## call API
+          data = EnfApi::Dns.instance.provision_server network, new_server
+          servers = data[:data]
+
+          ## display results
+          display_servers_table servers
+        end
+      end
+
+      desc "list-servers", "List DNS server in /64 network"
+      method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+      def list_servers
+        try_with_rescue_in_session do
+          ## gather parameters
+          network = options[:network]
+
+          ## call api
+          data = EnfApi::Dns.instance.list_servers network
+          servers = data[:data]
+
+          ## display resutls
+          display_servers_table servers
+        end
+      end
+
+      desc "delete-server", "Delete DNS server in /64 network"
+      method_option :'network', :type => :string, :banner => "/64 Enf Network", :required => true
+      method_option :'ipv6', :type => :string, :banner => "Server Ipv6", :required => true
+      def delete_server
+        try_with_rescue_in_session do
+          ## gather parameters
+          network = options[:network]
+          ipv6 = options[:ipv6]
+
+          ## call api
+          EnfApi::Dns.instance.delete_server network, ipv6
+
+          ## print success
+          say "Delete DNS server with ipv6 #{ipv6} in #{network}!", :green
+        end
+      end
+
+    end # Xdns
+
+  end # Cmd module
+end # EnfCli module

data/lib/enfcli/version.rb

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

data/lib/enfcli.rb

@@ -29,12 +29,16 @@ require 'enfcli/commands/xcr'
 require 'enfcli/commands/xiam'
 require 'enfcli/commands/xfw'
 require 'enfcli/commands/user'
+require 'enfcli/commands/captive'
+require 'enfcli/commands/xdns'
 
 module EnfCli
   FIREWALL_CMD = "firewall"
   IAM_CMD = "iam"
   NETWORK_CMD = "network"
   USER_CMD = "user"
+  CAPTIVE_CMD = "captive"
+  DNS_CMD = "dns"
 
   class IPV6
     def initialize(ipv6)
@@ -286,6 +290,7 @@ module EnfCli
         end
         
         def start(host, user)
+          $stdout.sync = true
           # Set prompt
           EnfCli::CTX.instance.prompt = user
 
@@ -383,7 +388,12 @@ module EnfCli
 
       desc "#{EnfCli::USER_CMD} COMMANDS", "#{EnfCli::USER_CMD} commands"
       subcommand EnfCli::USER_CMD, EnfCli::Cmd::User
-      
+
+      desc "#{EnfCli::CAPTIVE_CMD} COMMANDS", "#{EnfCli::CAPTIVE_CMD} commands"
+      subcommand EnfCli::CAPTIVE_CMD, EnfCli::Cmd::Captive
+
+      desc "#{EnfCli::DNS_CMD} COMMANDS", "#{EnfCli::DNS_CMD} commands"
+      subcommand EnfCli::DNS_CMD, EnfCli::Cmd::Xdns
     end
   end
   

data/lib/enfthor.rb

@@ -23,11 +23,11 @@ module EnfCli
 
     # helper functions
     no_commands {
-      
+
       def format_date(date)
         DateTime.strptime("#{date}",'%s') if date
       end
-          
+
       def render_table(headings, rows, file = nil)
         table = Terminal::Table.new
         table.headings = headings
@@ -50,25 +50,25 @@ module EnfCli
           raise EnfCli::ERROR, "User Session not establised!" if !session
 
           yield
-        end        
+        end
       end
 
       def try_with_rescue
-        begin          
+        begin
           yield
         rescue EnfApi::ERROR => e
           say e, :red
-          
+
         rescue OpenSSL::SSL::SSLError => e
           say e, :red
           say "Host may not support https. Try http instead", :bold
-          
+
         rescue => e
           say e, :red
         end
       end
 
-      
+
     }
 
     # override help methods
@@ -79,9 +79,9 @@ module EnfCli
         text = $stdout.string
         $stdout = STDOUT
         text
-      end     
-      
-      def help(shell, subcommand = false)        
+      end
+
+      def help(shell, subcommand = false)
         list = printable_commands(true, subcommand)
         Thor::Util.thor_classes_in(self).each do |klass|
           list += klass.printable_commands(false)
@@ -107,12 +107,12 @@ module EnfCli
 
         # Print the actual help message
         shell.say help_text
-        
+
         # Add this line if you want to print custom text at the end of your help output.
         # (similar to how Rails does it)
         shell.say 'All commands can be run with -h (or --help) for more information.'
       end
     end
-    
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0.pre.alpha
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -187,8 +187,10 @@ files:
 - enfcli.gemspec
 - lib/enfapi.rb
 - lib/enfcli.rb
+- lib/enfcli/commands/captive.rb
 - lib/enfcli/commands/user.rb
 - lib/enfcli/commands/xcr.rb
+- lib/enfcli/commands/xdns.rb
 - lib/enfcli/commands/xfw.rb
 - lib/enfcli/commands/xiam.rb
 - lib/enfcli/version.rb
@@ -207,9 +209,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.1
 signing_key: