enfcli 3.4.0.pre.alpha → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed23993cf8999c35cb290c1c5a694cb4b4ccdd2c4b9d55094c1ba80994eadc0c
-  data.tar.gz: 1ee8c5491dcab964f307832b18cff6def37feb6e04b528a3e0829b7572ad69a6
+  metadata.gz: da8ebf306726a1569a5a3153cfa050bb9b636061333373b4e4ea3f478f4bb90e
+  data.tar.gz: '067847d53544ab678eed5bd2d97ae3d1c180d3f89ee5a08483d535e36b74a86f'
 SHA512:
-  metadata.gz: 7c3dd1750b398ae9b37b7161bf8839df7f788a1c383e706b9087a0330b9fc3f8d0c606c93cf558470a8035e4f35a5c7e007aecb4b739baca146950900c438cf8
-  data.tar.gz: 78a255e25b8048bc813cc9a026ce051857d483ff0779352f7b2b81c6e0e3d9427678630b26fe3b9c350a99b5e1d39670f39711fd05289ce68c5fe0fa8c0ebf04
+  metadata.gz: 74c102ae5a073496bdb01207202c1424f42ebdb8775124a80a60f3825bcfb2feb2996344c706ff26f2ca41e11896b2c6ff120996ddf527faa9f0af3b5d013da7
+  data.tar.gz: 6faff192e846ef26cacd6e044a2db724ade8e4112c909d5bf1218b3517d0ad8d9a9450dfbfd49f8a6bf64b76b9c89b2c0e0a9fabfde12cf2dce631094a180a24

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enfcli (3.4.0.pre.alpha)
+    enfcli (3.4.0)
       rest-client (~> 2.0)
       terminal-table
       thor (~> 0.20.0)
@@ -15,7 +15,7 @@ GEM
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    domain_name (0.5.20180417)
+    domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
     fuubar (2.3.2)
       rspec-core (~> 3.0)

data/lib/enfapi.rb

@@ -18,7 +18,6 @@ require 'singleton'
 require 'json'
 require 'date'
 require 'base64'
-require 'cgi'
 
 #
 # NOTE: When api's are refactored into individual classes
@@ -31,109 +30,25 @@ module EnfApi
   def self.to_json(hash)
     JSON.generate(hash)
   end
-
-  def self.url_encode(str)
-    CGI.escape( str ).gsub("+", "%20")
-  end
-
+  
   class ERROR < StandardError
     def initialize(msg = "ENF Api Error")
       super
     end
   end
 
-  class Dns
-    include Singleton
-
-    def initialize
-      @version = "2019-05-27"
-      @xdns_base_url = "/api/xdns/#{@version}"
-    end
-
-    def list_zones(domain)
-      EnfApi::API.instance.get "#{@xdns_base_url}/zones?enf_domain=#{domain}"
-    end
-
-    def create_dns_zone(new_zone)
-      json = EnfApi::to_json(new_zone)
-      EnfApi::API.instance.post "#{@xdns_base_url}/zones", json
-    end
-
-    def update_dns_zone(zone_id, updated_zone)
-      json = EnfApi::to_json(updated_zone)
-      EnfApi::API.instance.put "#{@xdns_base_url}/zones/#{zone_id}", json
-    end
-
-    def delete_dns_zone(zone_id)
-      EnfApi::API.instance.delete "#{@xdns_base_url}/zones/#{zone_id}"
-    end
-
-    def add_networks_to_zone(zone_id, add_networks)
-      json = EnfApi::to_json(add_networks)
-      EnfApi::API.instance.post "#{@xdns_base_url}/zones/#{zone_id}/networks", json
-    end
-
-    def replace_networks_in_zone(zone_id, replace_networks)
-      json = EnfApi::to_json(replace_networks)
-      EnfApi::API.instance.put "#{@xdns_base_url}/zones/#{zone_id}/networks", json
-    end
-
-    def list_networks_in_zone(zone_id)
-      EnfApi::API.instance.get "#{@xdns_base_url}/zones/#{zone_id}/networks"
-    end
-
-    def delete_networks_from_zone(zone_id, delete_networks)
-      EnfApi::API.instance.delete "#{@xdns_base_url}/zones/#{zone_id}/networks?delete=#{delete_networks}"
-    end
-
-    def list_zones_in_network(network)
-      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/zones"
-    end
-
-    def provision_server(network, new_server)
-      json = EnfApi::to_json(new_server)
-      EnfApi::API.instance.post "#{@xdns_base_url}/networks/#{network}/servers", json
-    end
-
-    def list_servers(network)
-      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/servers"
-    end
-
-    def delete_server(network, server_ipv6)
-      EnfApi::API.instance.delete "#{@xdns_base_url}/networks/#{network}/servers/#{server_ipv6}"
-    end
-
-    def create_dns_record(zone_id, new_record)
-      json = EnfApi::to_json(new_record)
-      EnfApi::API.instance.post "#{@xdns_base_url}/zones/#{zone_id}/records", json
-    end
-
-    def list_dns_records(zone_id)
-      EnfApi::API.instance.get "#{@xdns_base_url}/zones/#{zone_id}/records"
-    end
-
-    def query(network, type, name)
-      EnfApi::API.instance.get "#{@xdns_base_url}/networks/#{network}/query/#{type}/#{name}"
-    end
-
-    def delete_dns_record(record_id)
-      EnfApi::API.instance.delete "#{@xdns_base_url}/records/#{record_id}"
-    end
-
-  end
-
   class Firewall
     include Singleton
-
+    
     def list_firewall_rules(network)
       EnfApi::API.instance.get "/api/xfw/v1/#{network}/rule"
     end
-
-    def add_firewall_rule(network, rule)
+    
+    def add_firewall_rule(network, rule)      
       rule_json = EnfApi::to_json(rule)
       EnfApi::API.instance.post "/api/xfw/v1/#{network}/rule", rule_json
     end
-
+    
     def delete_firewall_rules(network, id = nil)
       # Same method to call to delete all firewall rules in a network. if id is nil
       EnfApi::API.instance.delete "/api/xfw/v1/#{network}/rule/#{id}"
@@ -144,7 +59,7 @@ module EnfApi
     include Singleton
 
     ## NO_TEST
-    def provision_group(new_group)
+    def provision_group(new_group)      
       json = EnfApi::to_json(new_group)
       EnfApi::API.instance.post "/api/xiam/v1/groups", json
     end
@@ -156,7 +71,7 @@ module EnfApi
     end
 
     ## NO_TEST
-    def add_group_to_network(gid, ipv6_network)
+    def add_group_to_network(gid, ipv6_network)      
       json = EnfApi::to_json(ipv6_network)
       EnfApi::API.instance.post "/api/xiam/v1/groups/#{gid}/networks", json
     end
@@ -172,17 +87,17 @@ module EnfApi
     end
 
     ## NO_TEST
-    def provision_endpoint(new_endpoint)
+    def provision_endpoint(new_endpoint)      
       json = EnfApi::to_json(new_endpoint)
       EnfApi::API.instance.post "/api/xiam/v1/endpoints", json
     end
 
     ## NO_TEST
-    def update_endpoint_key(ipv6, credentials)
+    def update_endpoint_key(ipv6, credentials)         
       json = EnfApi::to_json(credentials)
       EnfApi::API.instance.post "/api/xiam/v1/endpoints/#{ipv6}/credentials", json
     end
-
+        
   end
 
   ##############################################################################
@@ -271,11 +186,13 @@ module EnfApi
       EnfApi::API.instance.put "/api/captive/v1/profile/#{id}", json
     end
   end
-  
+
+
+
   class NetworkManager
     include Singleton
   end
-
+  
   class API
     include Singleton
 
@@ -300,7 +217,7 @@ module EnfApi
         case response.code
         when 200
           # get resp from json
-          resp = from_json(response.body)
+          resp = from_json(response.body)          
 
           # set request headers for subsequent api calls
           token = resp[:data][0][:token]
@@ -316,28 +233,28 @@ module EnfApi
 
     def get(request_uri)
       @api[request_uri].get(@headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result       
       }
     end
 
     def post(request_uri, request_body = '')
       @api[request_uri].post(request_body, @headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result       
       }
     end
 
     def put(request_uri, request_body = '')
       @api[request_uri].put(request_body, @headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result       
       }
-    end
+    end    
 
     def delete(request_uri)
       @api[request_uri].delete(@headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result       
       }
-    end
-
+    end    
+  
 ############################################################################################################################
 # NOT READY API. MOVE ABOVE THIS LINE AFTER RSPEC OR INTO OWN CLASS
 ############################################################################################################################
@@ -347,47 +264,47 @@ module EnfApi
       }
     end
 
-    def list_enfnws
+    def list_enfnws      
       @api["/api/xcr/v2/enfnws"].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
-
-    def list_domains
+    
+    def list_domains  
       @api["/api/xcr/v2/domains"].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
-
-    def get_domain(domain_id)
+    
+    def get_domain(domain_id)      
       @api["/api/xcr/v2/domains/#{domain_id}"].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
     def create_domain(domain_hash)
-      json = to_json( domain_hash )
+      json = to_json( domain_hash )      
       @api["/api/xcr/v2/domains"].post( json, @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
     def update_domain_rate_limits(domain_network, limit, limits_hash)
-      json = to_json( limits_hash )
+      json = to_json( limits_hash )      
       @api["/api/xcr/v2/domains/#{domain_network}/ep_rate_limits/#{limit}"].put( json, @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
     def update_network_rate_limits(network, limit, limits_hash)
-      json = to_json( limits_hash )
+      json = to_json( limits_hash )      
       @api["/api/xcr/v2/nws/#{network}/ep_rate_limits/#{limit}"].put( json, @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
     def update_ep_rate_limits(ipv6, limit, limits_hash)
-      json = to_json( limits_hash )
+      json = to_json( limits_hash )      
       @api["/api/xcr/v2/cxns/#{ipv6}/ep_rate_limits/#{limit}"].put( json, @headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -396,7 +313,7 @@ module EnfApi
     def get_domain_rate_limits(domain_network, filter = nil)
       api_url = "/api/xcr/v2/domains/#{domain_network}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
-
+      
       @api[api_url].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -405,7 +322,7 @@ module EnfApi
     def get_network_rate_limits(network, filter = nil)
       api_url = "/api/xcr/v2/nws/#{network}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
-
+      
       @api[api_url].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -414,7 +331,7 @@ module EnfApi
     def get_ep_rate_limits(ipv6, filter = nil)
       api_url = "/api/xcr/v2/cxns/#{ipv6}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
-
+      
       @api[api_url].get( @headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -430,35 +347,35 @@ module EnfApi
       @api["/api/xcr/v2/domains/#{domain_network}/status"].delete( @headers) {|response, request, result|
         process_api_response response, request, result
       }
-    end
+    end 
 
     def create_nw(nw_hash)
       json = to_json(nw_hash)
-      domain_id = nw_hash[:domain_id]
+      domain_id = nw_hash[:domain_id]      
       @api["/api/xcr/v2/domains/#{domain_id}/nws"].post(json, @headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
-
-    def list_nw_connections(domain_id, network_cidr, file = nil)
+    
+    def list_nw_connections(domain_id, network_cidr, file = nil)      
       @api["/api/xcr/v2/domains/#{domain_id}/nws/#{network_cidr}/cxns"].get(@headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
-    def list_endpoint_events(ipv6)
+    def list_endpoint_events(ipv6)            
       @api["/api/xcr/v2/cxns/#{ipv6}/events"].get(@headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
-    def list_network_events(network_cidr)
+    def list_network_events(network_cidr)            
       @api["/api/xcr/v2/nws/#{network_cidr}/events"].get(@headers) {|response, request, result|
         process_api_response response, request, result
       }
     end
 
-    def get_endpoint(ipv6)
+    def get_endpoint(ipv6)            
       @api["/api/xcr/v2/cxns/#{ipv6}"].get(@headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -467,19 +384,19 @@ module EnfApi
     def update_endpoint(ipv6, name)
       hash = { :ipv6 => ipv6, :name => name }
       json = to_json( hash )
-
+      
       @api["/api/xcr/v2/cxns/#{ipv6}"].put( json, @headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result                
       }
     end
 
-    def activate_enfnw(subnet)
+    def activate_enfnw(subnet)            
       @api["/api/xcr/v2/enfnws/#{subnet}"].put( '', @headers) {|response, request, result|
-        process_api_response response, request, result
+        process_api_response response, request, result                
       }
     end
 
-    def list_domain_users(domain_network)
+    def list_domain_users(domain_network)      
       @api["/api/xcr/v2/domains/#{domain_network}/users"].get( @headers) {|response, request, result|
         puts response.code
         process_api_response response, request, result
@@ -496,10 +413,10 @@ module EnfApi
       json = to_json( hash )
       @api["/api/xcr/v2/domains/#{domain_network}/invites"].post( json, @headers) { |response, request, result|
         process_api_response response, request, result
-      }
+      }      
     end
 
-    def cancel_invite(email)
+    def cancel_invite(email)      
       @api["/api/xcr/v2/invites/#{email}"].delete( @headers) {|response, request, result|
         process_api_response response, request, result
       }
@@ -508,7 +425,7 @@ module EnfApi
     def resend_invite(email)
       @api["/api/xcr/v2/invites/#{email}"].put( "{}", @headers) {|response, request, result|
         process_api_response response, request, result
-      }
+      }      
     end
 
 ############################################################################################################################
@@ -523,7 +440,7 @@ module EnfApi
         when 201
           # return response body
           from_json(response.body)
-
+          
         when 400
           # api returns and error
           raise EnfApi::ERROR, api_error_msg(from_json(response.body))
@@ -535,12 +452,12 @@ module EnfApi
         when 403
           # api returns and error
           raise EnfApi::ERROR, "AUTHORIZATION_ERROR: User is not authorized to perform this operation!"
-
+          
         else
           raise EnfApi::ERROR, "Unexpected error! Please try again!"
         end
     end
-
+    
     def from_json(string)
       begin
         JSON.parse(string, {:symbolize_names => true})

data/lib/enfcli/version.rb

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

data/lib/enfcli.rb

@@ -30,7 +30,6 @@ 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"
@@ -38,7 +37,6 @@ module EnfCli
   NETWORK_CMD = "network"
   USER_CMD = "user"
   CAPTIVE_CMD = "captive"
-  DNS_CMD = "dns"
 
   class IPV6
     def initialize(ipv6)
@@ -392,8 +390,6 @@ module EnfCli
       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,11 +50,11 @@ 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
@@ -62,13 +62,13 @@ module EnfCli
         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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 3.4.0.pre.alpha
+  version: 3.4.0
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
@@ -190,7 +190,6 @@ files:
 - 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
@@ -209,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: 

data/lib/enfcli/commands/xdns.rb

@@ -1,446 +0,0 @@
-#
-# 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