enfcli 4.2.2.pre.alpha → 5.0.2

data/lib/enfcli/commands/xcr.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Xaptum,Inc
+# Copyright 2018-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -26,8 +26,8 @@ module EnfCli
             [hash[:ipv6],
              hash[:name],
              hash[:state],
-             hash[:state] == "OFFLINE" ? "" : hash[:ev_asn_org],
-             hash[:state] == "OFFLINE" ? "" : hash[:ev_remote_ip]]
+             hash[:state] == "OFFLINE" ? "" : hash[:last_event][:asn_org],
+             hash[:state] == "OFFLINE" ? "" : hash[:last_event][:remote_ip]]
           }
           render_table(headings, rows, options.file)
         end
@@ -41,23 +41,23 @@ module EnfCli
         end
 
         def display_domains(domains)
-          headings = ["Name", "Network", "Status"]
+          headings = ["Name", "Cidr", "Status"]
           rows = domains.map { |hash|
-            [hash[:name], hash[:network], hash[:status]]
+            [hash[:name], hash[:cidr], hash[:status]]
           }
           render_table(headings, rows)
         end
 
         def display_networks(networks)
-          headings = ["Name", "Network", "Description", "Status"]
+          headings = ["Name", "Cidr", "Description", "Status"]
           rows = networks.map { |hash|
-            [hash[:name], hash[:network], hash[:description], hash[:status]]
+            [hash[:name], hash[:cidr], hash[:description], hash[:status]]
           }
           render_table(headings, rows)
         end
 
         def display_network(network)
-          network_cidr = network[:network]
+          network_cidr = network[:cidr]
           name = network[:name] || ""
           description = network[:description] || ""
           status = network[:status] || ""
@@ -104,13 +104,26 @@ module EnfCli
       }
 
       desc "list-networks", "List all virtual networks in domain"
+      method_option :domain, type: :string, default: nil, banner: "/48 CIDR",
+                             aliases: "-d"
 
       def list_networks
         try_with_rescue_in_session do
-          domain_id = EnfCli::CTX.instance.session[:domain_id]
+          # get correct domain
+          domain = EnfCli::CTX.instance.session[:domain]
+          raise EnfCli::ERROR, "User not in a valid domain!" unless domain
+
+          # check if admin
+          if EnfCli::CTX.instance.xaptum_admin?
+            raise EnfCli::ERROR, "--domain is required" unless options[:domain]
+
+            domain = options[:domain]
+          elsif options[:domain]
+            say "Warning: Ignoring command option --domain #{options[:domain]}", :yellow
+          end
 
           # Call the api
-          data = EnfApi::API.instance.list_domain_nws domain_id
+          data = EnfApi::API.instance.list_domain_nws domain
           networks = data[:data]
 
           # display table
@@ -120,13 +133,24 @@ module EnfCli
 
       desc "provision-network", "Provision a Network"
       method_option :name, :type => :array, :required => true, :banner => "NAME"
+      method_option :domain, type: :string, default: nil, banner: "/48 CIDR",
+                             aliases: "-d"
       method_option :description, :type => :array, :banner => "DESCRIPTION"
 
       def provision_network
         try_with_rescue_in_session do
-          # verify domain context is set
-          domain_id = EnfCli::CTX.instance.session[:domain_id]
-          raise EnfCli::ERROR, "User's domain not available!" if !domain_id || domain_id < 0
+          # get correct domain
+          domain = EnfCli::CTX.instance.session[:domain]
+          raise EnfCli::ERROR, "User not in a valid domain!" unless domain
+
+          # check if admin
+          if EnfCli::CTX.instance.xaptum_admin?
+            raise EnfCli::ERROR, "--domain is required" unless options[:domain]
+
+            domain = options[:domain]
+          elsif options[:domain]
+            say "Warning: Ignoring command option --domain #{options[:domain]}", :yellow
+          end
 
           # Get options
           description = ""
@@ -136,10 +160,9 @@ module EnfCli
           # Call the api
           hash = {
             :name => network_name,
-            :domain_id => domain_id,
             :description => description,
           }
-          data = EnfApi::API.instance.create_nw hash
+          data = EnfApi::API.instance.create_nw domain, hash
           networks = data[:data]
 
           # display table
@@ -211,10 +234,10 @@ module EnfCli
 
           # call api
           data = { :data => [] }
-          case session[:type]
-          when "XAPTUM_ADMIN"
+
+          if EnfCli::CTX.instance.xaptum_admin?
             data = EnfApi::API.instance.list_domains
-          when "DOMAIN_ADMIN"
+          elsif EnfCli::CTX.instance.has_role?("DOMAIN_ADMIN")
             data = EnfApi::API.instance.get_domain session[:domain_id]
           end
 
@@ -252,13 +275,13 @@ module EnfCli
       end
 
       desc "list-domain-rate-limits", "List domain rate limits"
-      method_option :network, :type => :string, :required => true, :banner => "</48 Network>"
+      method_option :domain, :type => :string, :required => true, :banner => "/48 CIDR"
       method_option :filter, :type => :string, :enum => ["default", "max"]
 
       def list_domain_rate_limits
         try_with_rescue_in_session do
           # Call the api
-          data = EnfApi::API.instance.get_domain_rate_limits options[:network], options[:filter]
+          data = EnfApi::API.instance.get_domain_rate_limits options[:domain], options[:filter]
 
           # Get the limits
           limits = data[:data][0]
@@ -274,7 +297,7 @@ module EnfCli
       end
 
       desc "list-network-rate-limits", "List network rate limits"
-      method_option :network, :type => :string, :required => true
+      method_option :network, :type => :string, :required => true, :banner => "/64 CIDR"
       method_option :filter, :type => :string, :enum => ["default", "max"]
 
       def list_network_rate_limits
@@ -318,12 +341,12 @@ module EnfCli
       end
 
       desc "activate-domain", "Activate a customer's /48 domain"
-      method_option :network, :type => :string, :required => true
+      method_option :domain, :type => :string, :required => true, banner: "/48 CIDR"
 
       def activate_domain
         try_with_rescue_in_session do
           # Call api
-          data = EnfApi::API.instance.update_domain_status options[:network], { :status => "ACTIVE" }
+          data = EnfApi::API.instance.update_domain_status options[:domain], { :status => "ACTIVE" }
           domains = data[:data]
 
           # Display the data
@@ -333,12 +356,12 @@ module EnfCli
       end
 
       desc "deactivate-domain", "Deactivate a customer's /48 domain"
-      method_option :network, :type => :string, :required => true
+      method_option :domain, :type => :string, :required => true, banner: "/48 CIDR"
 
       def deactivate_domain
         try_with_rescue_in_session do
           # Call api
-          data = EnfApi::API.instance.update_domain_status options[:network], { :status => "READY" }
+          data = EnfApi::API.instance.update_domain_status options[:domain], { :status => "READY" }
           domains = data[:data]
 
           # Display the data
@@ -348,12 +371,12 @@ module EnfCli
       end
 
       desc "set-domain-rate-limits", "Update a customer /48 domain's endpoint rate limits"
-      method_option :network, :type => :string, :required => true
+      method_option :domain, :type => :string, :required => true, banner: "/48 CIDR"
       method_option :limit, :type => :string, :enum => ["default", "max"], :required => true
-      method_option :'packets-per-second', :type => :numeric, :required => true
-      method_option :'packets-burst-size', :type => :numeric, :required => true
-      method_option :'bytes-per-second', :type => :numeric, :required => true
-      method_option :'bytes-burst-size', :type => :numeric, :required => true
+      method_option :'packets-per-second', :type => :numeric, :required => true, aliases: "-p"
+      method_option :'packets-burst-size', :type => :numeric, :required => true, aliases: "-P"
+      method_option :'bytes-per-second', :type => :numeric, :required => true, aliases: "-b"
+      method_option :'bytes-burst-size', :type => :numeric, :required => true, aliases: "-B"
 
       def set_domain_rate_limits
         try_with_rescue_in_session do
@@ -364,7 +387,7 @@ module EnfCli
             :bytes_per_second => options["bytes-per-second"],
             :bytes_burst_size => options["bytes-burst-size"],
           }
-          data = EnfApi::API.instance.update_domain_rate_limits options[:network], options[:limit], hash
+          data = EnfApi::API.instance.update_domain_rate_limits options[:domain], options[:limit], hash
           limits = data[:data][0]
 
           # The Api returns only the rate limits object. Have to add type explicitly to display
@@ -378,10 +401,10 @@ module EnfCli
       desc "set-network-rate-limits", "Update a customer /64 network's endpoint rate limits"
       method_option :network, :type => :string, :required => true
       method_option :limit, :type => :string, :enum => ["default", "max"], :required => true
-      method_option :'packets-per-second', :type => :numeric, :required => true
-      method_option :'packets-burst-size', :type => :numeric, :required => true
-      method_option :'bytes-per-second', :type => :numeric, :required => true
-      method_option :'bytes-burst-size', :type => :numeric, :required => true
+      method_option :'packets-per-second', :type => :numeric, :required => true, aliases: "-p"
+      method_option :'packets-burst-size', :type => :numeric, :required => true, aliases: "-P"
+      method_option :'bytes-per-second', :type => :numeric, :required => true, aliases: "-b"
+      method_option :'bytes-burst-size', :type => :numeric, :required => true, aliases: "-B"
 
       def set_network_rate_limits
         try_with_rescue_in_session do
@@ -427,10 +450,10 @@ module EnfCli
       desc "set-endpoint-rate-limits", "Update an ipv6 endpoint rate limits"
       method_option :ipv6, :type => :string, :required => true
       method_option :limit, :type => :string, :enum => ["current", "max"], :required => true
-      method_option :'packets-per-second', :type => :numeric, :required => true
-      method_option :'packets-burst-size', :type => :numeric, :required => true
-      method_option :'bytes-per-second', :type => :numeric, :required => true
-      method_option :'bytes-burst-size', :type => :numeric, :required => true
+      method_option :'packets-per-second', :type => :numeric, :required => true, aliases: "-p"
+      method_option :'packets-burst-size', :type => :numeric, :required => true, aliases: "-P"
+      method_option :'bytes-per-second', :type => :numeric, :required => true, aliases: "-b"
+      method_option :'bytes-burst-size', :type => :numeric, :required => true, aliases: "-B"
 
       def set_endpoint_rate_limits
         try_with_rescue_in_session do
@@ -474,17 +497,13 @@ module EnfCli
       end
 
       desc "list-endpoints", "List all connections in a network"
-      method_option :network, :type => :string, :required => true
+      method_option :network, :type => :string, :required => true, banner: "/48 CIDR"
       method_option :file, :type => :string, :aliases => "-f"
 
       def list_endpoints
         try_with_rescue_in_session do
-          # verify domain context is set
-          domain_id = EnfCli::CTX.instance.session[:domain_id]
-          raise EnfCli::ERROR, "User's domain not available!" if !domain_id || domain_id < 0
-
           # call api
-          data = EnfApi::API.instance.list_nw_connections domain_id, options.network, options.file
+          data = EnfApi::API.instance.list_nw_connections options.network
           cxns = data[:data]
 
           # display table
@@ -550,15 +569,15 @@ module EnfCli
       end
 
       desc "activate-enf-network", "Active a /34 enf network"
-      method_option :network, :type => :string, :required => true
+      method_option :cidr, :type => :string, :required => true
 
       def activate_enfnw
         try_with_rescue_in_session do
           # Call the api
-          EnfApi::API.instance.activate_enfnw options.network
+          EnfApi::API.instance.activate_enfnw options.cidr
 
           # Print success
-          say "Activated Enf Network #{options.network}!", :green
+          say "Activated Enf Network #{options.cidr}!", :green
         end
       end
     end # class

data/lib/enfcli/commands/xdns.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2019 Xaptum,Inc
+# Copyright 2019-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 require "enfthor"
-require "enfapi"
+require "enfapi/dns"
 
 module EnfCli
   module Cmd
@@ -46,9 +46,9 @@ module EnfCli
         end
 
         def display_zones_table(zones)
-          headings = ["Id", "Zone", "Description", "Enf Domain"]
+          headings = ["Id", "Zone", "Description", "Privileged", "Enf Domain"]
           rows = zones.map { |hash|
-            [hash[:id], hash[:zone_domain_name], hash[:description], hash[:enf_domain]]
+            [hash[:id], hash[:zone_domain_name], hash[:description], hash[:privileged], hash[:enf_domain]]
           }
           render_table(headings, rows)
         end
@@ -82,6 +82,7 @@ module EnfCli
       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"
+      method_option :'enf-network', :type => :string, :banner => "/64 Enf Network"
 
       def create_zone
         try_with_rescue_in_session do
@@ -91,12 +92,16 @@ module EnfCli
           ## 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"
+          if EnfCli::CTX.instance.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]
+            enf_domain = session[:domain]
+          end
+
+          enf_network = options["enf-network"]
+          unless EnfCli::CTX.instance.edit_domain_role?
+            raise "No value provided for required option '--enf-network'" unless enf_network
           end
 
           ## create request hash
@@ -106,6 +111,9 @@ module EnfCli
             :enf_domain => enf_domain,
           }
 
+          ## add enf_network to request if present
+          new_zone[:enf_network] = enf_network if enf_network
+
           ## call api
           data = EnfApi::Dns.instance.create_dns_zone new_zone
           zones = data[:data]
@@ -125,12 +133,11 @@ module EnfCli
           ## session
           session = EnfCli::CTX.instance.session
 
-          case session[:type]
-          when "XAPTUM_ADMIN"
+          if EnfCli::CTX.instance.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]
+            enf_domain = session[:domain]
           end
 
           ## call api

data/lib/enfcli/commands/xfw.rb

@@ -1,5 +1,5 @@
 #
-# Copyright 2018 Xaptum,Inc
+# Copyright 2018-2020 Xaptum,Inc
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 require "enfthor"
-require "enfapi"
+require "enfapi/firewall"
 require "base64"
 require "digest"
 require "openssl"
@@ -44,7 +44,8 @@ module EnfCli
       def list_firewall_rules
         try_with_rescue_in_session do
           # call the api
-          rules = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          data = EnfApi::Firewall.instance.list_firewall_rules options[:network]
+          rules = data[:data]
 
           # display empty table and return
           if rules.length == 0
@@ -90,7 +91,7 @@ module EnfCli
       end
 
       desc "add-firewall-rule", "Add a firewall rule to a /64 network"
-      method_option :network, :type => :string, :required => true
+      method_option :network, :type => :string
       method_option :priority, :type => :numeric, :required => true
       method_option :protocol, :type => :string, :required => true, :enum => ["TCP", "UDP", "ICMP6", "6", "17", "58"]
       method_option :source_ip, :type => :string
@@ -117,10 +118,12 @@ module EnfCli
           }
 
           # call the api
-          EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          data = EnfApi::Firewall.instance.add_firewall_rule options[:network], rule
+          rules = data[:data]
 
           # print success
           say "Created firewall rule!", :green
+          display_firewall_rules rules
         end
       end
 

data/lib/enfcli/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 #
 module EnfCli
-  VERSION = "4.2.2-alpha"
+  VERSION = "5.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enfcli
 version: !ruby/object:Gem::Version
-  version: 4.2.2.pre.alpha
+  version: 5.0.2
 platform: ruby
 authors:
 - Venkatakumar Srinivasan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -243,6 +243,9 @@ files:
 - enfcli.gemspec
 - format.sh
 - lib/enfapi.rb
+- lib/enfapi/dns.rb
+- lib/enfapi/firewall.rb
+- lib/enfapi/user.rb
 - lib/enfcli.rb
 - lib/enfcli/commands/captive.rb
 - lib/enfcli/commands/user.rb
@@ -266,9 +269,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.3
 signing_key: