enfcli 4.2.2.pre.alpha → 5.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f256d19a0f175c9777452f20122626759e03150d7c38ade9efb07d7e10a678
-  data.tar.gz: dd144287a9e386c8f0e5668af644ed9ed0ad92b51b14344c58009021fdd701eb
+  metadata.gz: 29f4309503935f6931b068e80a850488b2f8833474734c05e8455a04f84293e0
+  data.tar.gz: 2488271b45ee7c7e5b96cc95546d2f625fb1c503d9ad6720f62649073d4a1874
 SHA512:
-  metadata.gz: 0d1663bdce6d7fff2f4bfb81e8950a0f657b09b390aa684a6108e4372bd406d8f5c8162285fe0af955e253915cc6a967858a66c1565eff841067586bba1601c8
-  data.tar.gz: 6001fbb970ba8d329e587dc1a8fc42a6ac589bf883ff2b1fd1d470e3c03718ea13b0d1dfba2ccd67d654dded81156d8ad6dc0cbe601d7c722c7b1ae59b056e86
+  metadata.gz: 033366cb4db237f61526ddf357bbdfd57d60b482398d21eee798413b5afc91b51a6baae60526b957f07a80f01dea5b47372d72193d40b0af20a98fb88de1cd51
+  data.tar.gz: e7bd3d1c7da7a861a89f242bd5a2d2f898e5e5b4f848c2412fa9a1b5acb7ac73fb5c679979e80b9b7d1e81ba87de761f157141d49eda2d6c3c5d55b1b315c249

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    enfcli (4.2.2.pre.alpha)
+    enfcli (5.0.0.pre.alpha)
       clipboard
       ffi
       readline
@@ -15,7 +15,7 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     bump (0.8.0)
-    clipboard (1.3.4)
+    clipboard (1.3.3)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
@@ -29,16 +29,16 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    io-console (0.5.6)
+    io-console (0.5.5)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.0425)
+    mime-types-data (3.2019.1009)
     netrc (0.11.0)
     public_suffix (4.0.3)
     rake (10.5.0)
     readline (0.0.2)
       reline
-    reline (0.1.4)
+    reline (0.1.2)
       io-console (~> 0.5)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
@@ -68,8 +68,8 @@ GEM
     thor (0.20.3)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (1.7.0)
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.6.1)
     vcr (5.0.0)
     webmock (3.7.6)
       addressable (>= 2.3.6)

data/lib/enfapi.rb

@@ -30,6 +30,14 @@ module EnfApi
     JSON.generate(hash)
   end
 
+  def self.from_json(string)
+    begin
+      JSON.parse(string, { symbolize_names: true })
+    rescue
+      raise EnfApi::ERROR, "Unable to parse api response json!"
+    end
+  end
+
   def self.url_encode(str)
     CGI.escape(str).gsub("+", "%20")
   end
@@ -40,103 +48,6 @@ module EnfApi
     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)
-      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}"
-    end
-  end
-
   class Iam
     include Singleton
 
@@ -389,11 +300,11 @@ module EnfApi
       @api = RestClient::Resource.new(host)
 
       # Create request json
-      hash = { :username => user, :token => password }
+      hash = { username: user, password: password }
       json = to_json(hash)
 
       # call api
-      @api["/api/xcr/v2/xauth"].post(json, { content_type: :json, accept: :json }) { |response, request, result|
+      @api["/api/xcr/v3/xauth"].post(json, { content_type: :json, accept: :json }) { |response, request, result|
         case response.code
         when 200
           # get resp from json
@@ -439,59 +350,59 @@ module EnfApi
     # NOT READY API. MOVE ABOVE THIS LINE AFTER RSPEC OR INTO OWN CLASS
     ############################################################################################################################
     def list_domain_nws(domain_id)
-      @api["/api/xcr/v2/domains/#{domain_id}/nws"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/domains/#{domain_id}/nws"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def list_enfnws
-      @api["/api/xcr/v2/enfnws"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/enfnws"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def list_domains
-      @api["/api/xcr/v2/domains"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/domains"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def get_domain(domain_id)
-      @api["/api/xcr/v2/domains/#{domain_id}"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/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)
-      @api["/api/xcr/v2/domains"].post(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/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)
-      @api["/api/xcr/v2/domains/#{domain_network}/ep_rate_limits/#{limit}"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/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)
-      @api["/api/xcr/v2/nws/#{network}/ep_rate_limits/#{limit}"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/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)
-      @api["/api/xcr/v2/cxns/#{ipv6}/ep_rate_limits/#{limit}"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/cxns/#{ipv6}/ep_rate_limits/#{limit}"].put(json, @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def get_domain_rate_limits(domain_network, filter = nil)
-      api_url = "/api/xcr/v2/domains/#{domain_network}/ep_rate_limits"
+      api_url = "/api/xcr/v3/domains/#{domain_network}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
 
       @api[api_url].get(@headers) { |response, request, result|
@@ -500,7 +411,7 @@ module EnfApi
     end
 
     def get_network_rate_limits(network, filter = nil)
-      api_url = "/api/xcr/v2/nws/#{network}/ep_rate_limits"
+      api_url = "/api/xcr/v3/nws/#{network}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
 
       @api[api_url].get(@headers) { |response, request, result|
@@ -509,7 +420,7 @@ module EnfApi
     end
 
     def get_ep_rate_limits(ipv6, filter = nil)
-      api_url = "/api/xcr/v2/cxns/#{ipv6}/ep_rate_limits"
+      api_url = "/api/xcr/v3/cxns/#{ipv6}/ep_rate_limits"
       api_url = "#{api_url}/#{filter}" if filter
 
       @api[api_url].get(@headers) { |response, request, result|
@@ -519,105 +430,66 @@ module EnfApi
 
     def update_domain_status(domain_network, status)
       json = to_json(status)
-      @api["/api/xcr/v2/domains/#{domain_network}/status"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/domains/#{domain_network}/status"].put(json, @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
-    def create_nw(nw_hash)
+    def create_nw(domain, nw_hash)
       json = to_json(nw_hash)
-      domain_id = nw_hash[:domain_id]
-      @api["/api/xcr/v2/domains/#{domain_id}/nws"].post(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/domains/#{domain}/nws"].post(json, @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def update_nw(network_cidr, nw_hash)
       json = to_json(nw_hash)
-      @api["/api/xcr/v2/nws/#{network_cidr}"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/nws/#{network_cidr}"].put(json, @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def get_nw(network_cidr)
-      @api["/api/xcr/v2/nws/#{network_cidr}"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/nws/#{network_cidr}"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
-    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|
+    def list_nw_connections(network_cidr, file = nil)
+      @api["/api/xcr/v3/nws/#{network_cidr}/cxns"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def list_endpoint_events(ipv6)
-      @api["/api/xcr/v2/cxns/#{ipv6}/events"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/cxns/#{ipv6}/events"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def list_network_events(network_cidr)
-      @api["/api/xcr/v2/nws/#{network_cidr}/events"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/nws/#{network_cidr}/events"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def get_endpoint(ipv6)
-      @api["/api/xcr/v2/cxns/#{ipv6}"].get(@headers) { |response, request, result|
+      @api["/api/xcr/v3/cxns/#{ipv6}"].get(@headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def update_endpoint(ipv6, name)
-      hash = { :ipv6 => ipv6, :name => name }
+      hash = { ipv6: ipv6, name: name }
       json = to_json(hash)
 
-      @api["/api/xcr/v2/cxns/#{ipv6}"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/cxns/#{ipv6}"].put(json, @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
 
     def activate_enfnw(subnet)
-      @api["/api/xcr/v2/enfnws/#{subnet}"].put("", @headers) { |response, request, result|
-        process_api_response response, request, result
-      }
-    end
-
-    def list_domain_users(domain_network)
-      @api["/api/xcr/v2/domains/#{domain_network}/users"].get(@headers) { |response, request, result|
-        process_api_response response, request, result
-      }
-    end
-
-    def list_domain_invites(domain_network)
-      @api["/api/xcr/v2/domains/#{domain_network}/invites"].get(@headers) { |response, request, result|
-        process_api_response response, request, result
-      }
-    end
-
-    def invite(domain_network, hash)
-      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)
-      @api["/api/xcr/v2/invites/#{email}"].delete(@headers) { |response, request, result|
-        process_api_response response, request, result
-      }
-    end
-
-    def resend_invite(email)
-      @api["/api/xcr/v2/invites/#{email}"].put("{}", @headers) { |response, request, result|
-        process_api_response response, request, result
-      }
-    end
-
-    def update_user_status(user_id, status)
-      json = to_json(status)
-      @api["/api/xcr/v2/users/#{user_id}/status"].put(json, @headers) { |response, request, result|
+      @api["/api/xcr/v3/enfnws/#{subnet}"].put("", @headers) { |response, request, result|
         process_api_response response, request, result
       }
     end
@@ -665,15 +537,11 @@ module EnfApi
     end
 
     def from_json(string)
-      begin
-        JSON.parse(string, { :symbolize_names => true })
-      rescue
-        raise EnfApi::ERROR, "Unable to parse api response json!"
-      end
+      EnfApi::from_json(string)
     end
 
     def to_json(hash)
-      JSON.generate(hash)
+      EnfApi::to_json(hash)
     end
 
     def api_error_msg(err)

data/lib/enfapi/dns.rb

@@ -0,0 +1,95 @@
+#
+# Copyright 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.
+# 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.
+#
+module EnfApi
+  class Dns
+    include Singleton
+
+    def initialize
+      @version = "v1"
+      @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
+end