jss-api 0.6.1 → 0.6.2

data/bin/subnet-update

@@ -1,400 +0,0 @@
-#!/usr/bin/ruby
-
-### Copyright 2016 Pixar
-###  
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###  
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###  
-###    You may obtain a copy of the Apache License at
-###  
-###        http://www.apache.org/licenses/LICENSE-2.0
-###  
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-
-##############################
-# == Synopsis
-#   Add, remove, or change the Network Segments in the JSS based on data from an input file
-#   in CSV, tab, or other delimited format.
-#
-# == Usage
-#   subnet-update [-t | -d delimiter] [-h] file
-#
-#
-# == Author
-#   Chris Lasell <chrisl@pixar.com>
-#
-# == Copyright
-#   Copyright (c) 2014 Pixar Animation Studios
-
-##############################
-# Libraries
-require 'jss-api'
-require 'getoptlong'
-
-##############################
-# The app object
-class App
-
-  ##############################
-  # Constants
-
-  USAGE = "Usage: #{File.basename($0)} [-d delim] [--header] [-c col1,col2,col3 ] [-m manual-prefix] [--help] /path/to/file"
-
-  POTENTIAL_COLUMNS = [:name, :starting, :ending, :cidr]
-
-  # Whenever we process a file, we store it here. The next time we
-  # run, if the input file is identical to this, we exit witout doing anything.
-  DEFAULT_CACHE_FILE = Pathname.new("~/.last_subnet_update").expand_path
-
-  DEFAULT_DELIMITER = "\t"
-  DEFAULT_COLUMNS =  [:name, :starting, :ending]
-  DEFAULT_MANUAL_PREFIX = "Manual-"
-
-
-  attr_reader :debug
-
-  ###############
-  # set up
-  def initialize(args)
-
-    # set defaults
-    @debug = false
-
-    @delim = DEFAULT_DELIMITER
-    @header = false
-    @columns = DEFAULT_COLUMNS
-    @cache_file = DEFAULT_CACHE_FILE
-    @manual_prefix =  DEFAULT_MANUAL_PREFIX
-
-
-    #define the cli opts
-    cli_opts = GetoptLong.new(
-      [ '--help', '-H', GetoptLong::NO_ARGUMENT ],
-      [ '--delimiter', '--delim', '-d', GetoptLong::REQUIRED_ARGUMENT],
-      [ '--header', '-h', GetoptLong::NO_ARGUMENT],
-      [ '--columns', '-c', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--manual-prefix', '-m',  GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--cache', GetoptLong::REQUIRED_ARGUMENT ],
-      [ '--debug', GetoptLong::NO_ARGUMENT],
-      [ '--server', '-S', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--port', '-P', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--user', '-U', GetoptLong::OPTIONAL_ARGUMENT],
-      [ '--no-verify-cert', '-V', GetoptLong::NO_ARGUMENT],
-      [ '--timeout', '-T', GetoptLong::OPTIONAL_ARGUMENT]
-    )
-
-    # parse the cli opts
-    cli_opts.each do |opt, arg|
-      case opt
-        when '--help' then  show_help
-        when '--delimiter' then @delim = arg
-        when '--header' then @header = true
-        when '--columns' then @columns = arg.split(',').map{|c| c.to_sym}
-        when '--manual-prefix' then @manual_prefix = arg
-        when '--cache' then @cache_file = Pathname.new arg
-        when '--debug' then @debug = true
-        when '--server'
-          @server = arg
-
-        when '--port'
-          @port = arg
-
-        when '--user'
-          @user = arg
-
-        when '--no-verify-cert'
-          @verify_cert = false
-
-        when '--timeout'
-          @timeout = arg
-
-      end # case
-    end # each opt arg
-
-
-    @columns = nil if @columns and @columns.empty?
-
-    @file = args.shift
-
-
-  end # init
-
-  ###############
-  # Go!
-  def run
-
-    unless @file
-      puts "No input file specified."
-      puts USAGE
-      return
-    end
-
-    @file = Pathname.new @file
-
-    unless parse_file
-      puts "File hasn't changed since last time, no changes to make!"
-      return
-    end
-
-    # use any config settings defined....
-    @user ||= JSS::CONFIG.api_username
-    @server ||= JSS::CONFIG.api_server_name
-    @getpass =  $stdin.tty? ? :prompt : :stdin
-
-    raise JSS::MissingDataError, "No JSS Username provided or found in the JSS gem config." unless @user
-    raise JSS::MissingDataError, "No JSS Server provided or found in the JSS gem config." unless @server
-
-    JSS::API.connect( :server => @server,
-      :port => @port,
-      :verify_cert => @verify_cert,
-      :user => @user,
-      :pw => @getpass,
-      :stdin_line => 1,
-      :timeout => @timeout
-    )
-
-    update_network_segments
-
-  end # run
-
-  #####################################
-  ###
-  ### Show Help
-  ###
-  def show_help
-    puts <<-FULLHELP
-Update the JSS Network Segments from a delimited file of subnet information.
-
-#{USAGE}
-
-Options:
- -d, --delimiter        - The field delimiter in the file, defaults to tab.
- -c, --columns [col1,col2,col3]
-                        - The column order in file, must include 'name', 'starting',
-                            and either 'ending' or 'cidr'
- -h, --header           - The first line of the file is a header line,
-                            possibly defining the columns
- -m, --manual-prefix    - Network Segment names in the JSS with this prefix are ignored.
-                            Defaults to 'Manual-'
- --cache /path/..       - Where read/save the input data for comparison between runs.
-                            Defaults to ~/.last_subnet_update
- -S, --server srvr      - specify the JSS API server name
- -P, --port portnum     - specify the JSS API port
- -U, --user username    - specify the JSS API user
- -V, --no-verify-cert   - Allow self-signed, unverified SSL certificate
- -T, --timeout secs     - specify the JSS API timeout
- -H, --help             - show this help
- --debug                - show the ruby backtrace when errors occur
-
-This program parses the input file line by line (possibly accounting for a header line).
-Each line defines the name and IP-range of a subnet/network segment.
-
-- If a segment doesn't exist in the JSS, it is created.
-- If a segment's range has changed, it is updated in the JSS.
-- If a JSS segment doesn't exist in the file, it is deleted from the JSS
-  unless its name starts with the --manual-prefix
-
-Input File:
-  - The file must contain three columns, separated by the --delimiter,
-    with these names, in any order:
-    - 'name'  (the network segment name)
-    - 'starting' (the starting IP address of the network segment)
-    - EITHER of:
-      - 'ending' (the ending IP address of the network segment)
-      - 'cidr'  (the network range of the segment as a CIDR bitmask, e.g. '24')
-Notes:
- - The --columns option is a comma-separted list of the three
-   column names aboveindicating the column-order in the file.
-
- - If --columns are not provided, and --header is specified, the first line
-  is assumed to contain the column names, separated by the delimiter
-
- - If --header is provided with --columns, the first line of the file is ignored.
-
- - The raw data from the file is cached and compared to the input file at
-   the next run. If the data is identical, no JSS connection is made.
-
- - If no API settings are provided, they will be read from /etc/jss_gem.conf
-   and ~/.jss_gem.conf. See the JSS Gem docs for details.
-
- - The password for the connection will be read from STDIN or prompted if needed
-
-    FULLHELP
-    exit 0
-  end
-
-  ########################
-  # parse the incoming data file.
-  # If the file hasn't changed from the last time we processed it
-  # then return false
-  # otherwise parse it into @parsed_data and return true
-  # @parsed_data is an array of hashes, each with :name, :starting, and :ending
-  #
-  def parse_file
-
-    raise "'#{@file}' is not readable, or not a regular file" unless @file.readable? and @file.file?
-
-    # read in the file
-    @raw_data = @file.read
-
-    # compare it to the one we used last time
-    if @cache_file.readable?
-      return false if @raw_data == @cache_file.read
-    end
-
-    # split the data into an array by newlines
-    lines = @raw_data.split "\n"
-
-    # remove the first line if its a header, and parse it into the columns
-    # if needed
-    if @header
-      header = lines.shift
-      @columns ||= header.split(/\s*#{@delim}\s*/).map{|c| c.to_sym}
-    end
-
-    # check some state
-    raise "Columns must include 'name' and 'starting'" unless @columns.include?(:name) and @columns.include?(:starting)
-    raise "Columns must include either 'ending' or 'cidr'" unless @columns.include?(:ending) or @columns.include?(:cidr)
-
-    @use_cidr = @columns.include? :cidr
-
-
-    # which columns are which in the file?
-    name = @columns.index :name
-    starting = @columns.index :starting
-    ending = @use_cidr ? @columns.index(:cidr) : @columns.index(:ending)
-
-    # split each line and convert it into a hash
-    @parsed_data = lines.map do |line|
-
-      parts = line.split(@delim).map{|f| f.strip }
-
-      unless parts[name] and parts[starting] and parts[ending]
-        puts "Skipping invalid line: #{line}"
-        next
-      end
-      
-      
-      {:name => parts[name], :starting => parts[starting], :ending => parts[ending]}
-    end
-
-    # parsed data is now an array of hashes
-    return true
-  end
-
-  #############################################
-  #############################################
-  # Update the JSS Network Segments from GIT_NETBLOCKS_URL, q.v.
-  def update_network_segments
-
-    # CREATE any that are in the parsed data but not yet in the JSS,
-    # and UPDATE any that exist but have modified ranges.
-    # While looping through, make a hash of JSS::NetworkSegment objects, keyed by their name.
-    segs_from_data = {}
-
-    @parsed_data.each do |pd|
-
-      # skip anthing with the manual prefix
-      next if pd[:name].start_with? @manual_prefix
-
-      ender =  @use_cidr ? :cidr : :ending_address
-
-      begin
-        this_seg =  JSS::NetworkSegment.new(:id => :new, :name => pd[:name], :starting_address => pd[:starting], ender => pd[:ending])
-
-        # If the new netsegment should have other settings (dist. point, netboot server, etc...)
-        # here's where you should apply those settings.
-
-        this_seg.create
-        puts "Added Network Segment '#{this_seg.name}' to the JSS"
-
-      # it already exists, so see if it needs any changes
-      rescue JSS::AlreadyExistsError
-
-        # there's already one with this name, so just grab it.
-        this_seg =  JSS::NetworkSegment.new( :name => pd[:name])
-
-        # does the startng addres need to be changed?
-        needs_update = this_seg.starting_address.to_s != pd[:starting].to_s
-
-        # even if we don't need to update the starting, we might need to update
-        # the ending...
-        unless needs_update
-          if @use_cidr
-            needs_update = this_seg.cidr.to_i != pd[:ending].to_i
-          else
-            needs_update = this_seg.ending_address.to_s != pd[:ending].to_s
-          end # if @use_cidr
-        end #unless needs update
-
-        # did we decide we need an update?
-        if needs_update
-          this_seg.starting_address = pd[:starting]
-          if @use_cidr
-            this_seg.cidr = pd[:ending].to_i
-          else
-            this_seg.ending_address = pd[:ending]
-          end # if @use_cidr
-          this_seg.update
-          puts "Updated IP range for Network Segment '#{this_seg.name}'"
-
-        else # doesn't need update
-          puts "Network Segment '#{this_seg.name}' doesn't have any changes."
-        end # if needs update
-      
-      # rescue other errors
-      rescue
-        raise "There was an error with NetworkSegment #{pd[:name]}: #{$!}"
-      end # begin
-
-      segs_from_data[this_seg.name] = this_seg
-    end
-
-
-    # DELETE those in jss, but not in parsed data,
-    # unless the name starts with @manual_prefix
-    JSS::NetworkSegment.map_all_ids_to(:name).each do |id,name|
-
-      next if name.start_with? @manual_prefix
-
-      unless segs_from_data.keys.include? name
-        JSS::NetworkSegment.new(:id => id).delete
-        puts "Deleted Network Segment '#{name}' from the JSS"
-      end # unless
-
-    end # jss_uids.each seg
-
-    # save the data into a file for comparison next time
-    @cache_file.jss_save @raw_data 
-
-    # all done
-    return true
-  end # update_network_segments
-
-end # app
-
-##############################
-# create the app and go
-begin
-  app = App.new(ARGV)
-  app.run
-rescue
-  # handle exceptions not handled elsewhere
-  puts "An error occurred: #{$!}"
-  puts "Backtrace:" if app.debug
-  puts $@ if app.debug
-
-ensure
-
-end

data/lib/jss-api/api_connection.rb

@@ -1,400 +0,0 @@
-### Copyright 2016 Pixar
-###  
-###    Licensed under the Apache License, Version 2.0 (the "Apache License")
-###    with the following modification; you may not use this file except in
-###    compliance with the Apache License and the following modification to it:
-###    Section 6. Trademarks. is deleted and replaced with:
-###  
-###    6. Trademarks. This License does not grant permission to use the trade
-###       names, trademarks, service marks, or product names of the Licensor
-###       and its affiliates, except as required to comply with Section 4(c) of
-###       the License and to reproduce the content of the NOTICE file.
-###  
-###    You may obtain a copy of the Apache License at
-###  
-###        http://www.apache.org/licenses/LICENSE-2.0
-###  
-###    Unless required by applicable law or agreed to in writing, software
-###    distributed under the Apache License with the above modification is
-###    distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-###    KIND, either express or implied. See the Apache License for the specific
-###    language governing permissions and limitations under the Apache License.
-### 
-###
-
-###
-module JSS
-
-  #####################################
-  ### Constants
-  #####################################
-
-  #####################################
-  ### Module Variables
-  #####################################
-
-  #####################################
-  ### Module Methods
-  #####################################
-
-  #####################################
-  ### Module Classes
-  #####################################
-
-  ###
-  ### An API connection to the JSS.
-  ###
-  ### This is a singleton class, only one can exist at a time.
-  ### Its one instance is created automatically when the module loads, but it
-  ### isn't connected to anything at that time.
-  ###
-  ### Use it via the {JSS::API} constant to call the #connect
-  ### method, and the {#get_rsrc}, {#put_rsrc}, {#post_rsrc}, & {#delete_rsrc}
-  ### methods, q.v. below.
-  ###
-  ### To access the underlying RestClient::Resource instance,
-  ### use JSS::API.cnx
-  ###
-  class APIConnection
-    include Singleton
-
-    #####################################
-    ### Class Constants
-    #####################################
-
-    ### The base API path in the jss URL
-    RSRC_BASE = "JSSResource"
-    
-    ### A url path to load to see if there's an API available at a host.
-    ### This just loads the API resource docs page
-    TEST_PATH = "api"
-    
-    ### If the test path loads correctly from a casper server, it'll contain
-    ### this text
-    TEST_CONTENT = "<title>JSS REST API Resource Documentation</title>"
-    
-    ### The Default port
-    HTTP_PORT = 9006
-
-    ### The SSL port
-    SSL_PORT = 8443
-
-    ### The top line of an XML doc for submitting data via API
-    XML_HEADER = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'
-
-    ### Default timeouts in seconds
-    DFT_OPEN_TIMEOUT = 60
-    DFT_TIMEOUT = 60
-    
-    ### The Default SSL Version
-    DFT_SSL_VERSION = 'TLSv1'
-    
-    #####################################
-    ### Attributes
-    #####################################
-
-    ### @return [String] the username who's connected to the JSS API
-    attr_reader :jss_user
-
-    ### @return [RestClient::Resource] the underlying connection resource
-    attr_reader :cnx
-
-    ### @return [Boolean] are we connected right now?
-    attr_reader :connected
-
-    ### @return [JSS::Server] the details of the JSS to which we're connected.
-    attr_reader :server
-
-    ### @return [String] the hostname of the JSS to which we're connected.
-    attr_reader :server_host
-    
-    #####################################
-    ### Constructor
-    #####################################
-
-    ###
-    ### To connect, use JSS::APIConnection.instance.connect
-    ### or a shortcut, JSS::API.connect
-    ###
-    def initialize ()
-      @connected = false
-    end # init
-
-    #####################################
-    ### Class Methods
-    #####################################
-
-    ###
-    ### Connect to the JSS API.
-    ###
-    ### @param args[Hash] the keyed arguments for connection.
-    ###
-    ### @option args :server[String] the hostname of the JSS API server, required if not defined in JSS::CONFIG
-    ###
-    ### @option args :port[Integer] the port number to connect with, defaults to 8443
-    ###
-    ### @option args :use_ssl[Boolean] should the connection be made over SSL? Defaults to true.
-    ###
-    ### @option args :verify_cert[Boolean] should HTTPS SSL certificates be verified. Defaults to true.
-    ###   If your connection raises RestClient::SSLCertificateNotVerified, and you don't care about the
-    ###   validity of the SSL cert. just set this explicitly to false.
-    ###
-    ### @option args :user[String] a JSS user who has API privs, required if not defined in JSS::CONFIG
-    ###
-    ### @option args :pw[String,Symbol] Required, the password for that user, or :prompt, or :stdin
-    ###   If :prompt, the user is promted on the commandline to enter the password for the :user.
-    ###   If :stdin#, the password is read from a line of std in represented by the digit at #, 
-    ###   so :stdin3 reads the passwd from the third line of standard input. defaults to line 1, 
-    ###   if no digit is supplied. see {JSS.stdin}
-    ###
-    ### @option args :open_timeout[Integer] the number of seconds to wait for an initial response, defaults to 60
-    ###
-    ### @option args :timeout[Integer] the number of seconds before an API call times out, defaults to 60
-    ###
-    ### @return [true]
-    ###
-    def connect (args = {})
-      
-      # the server, if not specified, might come from a couple places.
-      # see #hostname
-      args[:server] ||= hostname
-      
-      # settings from config if they aren't in the args
-      args[:server] ||= JSS::CONFIG.api_server_name
-      args[:port] ||= JSS::CONFIG.api_server_port
-      args[:user] ||= JSS::CONFIG.api_username
-      args[:timeout] ||= JSS::CONFIG.api_timeout
-      args[:open_timeout] ||= JSS::CONFIG.api_timeout_open
-      args[:ssl_version] ||= JSS::CONFIG.api_ssl_version
-
-      # if verify cert given was NOT in the args....
-      if args[:verify_cert].nil?
-        # set it from the prefs
-        args[:verify_cert] = JSS::CONFIG.api_verify_cert
-      end
-      
-      # settings from client jamf plist if needed
-      args[:port] ||=  JSS::Client.jss_port
-      
-      # default settings if needed
-      args[:port] ||= SSL_PORT
-      args[:timeout] ||= DFT_TIMEOUT
-      args[:open_timeout] ||= DFT_OPEN_TIMEOUT
-      
-      # As of Casper 9.61 we can't use SSL, must use TLS, since SSLv3 was susceptible to poodles.
-      # NOTE - this requires rest-client v 1.7.0 or higher
-      # which requires mime-types 2.0 or higher, which requires ruby 1.9.2 or higher!
-      # That means that support for ruby 1.8.7 stops with Casper 9.6
-      args[:ssl_version] ||= DFT_SSL_VERSION
-      
-      
-      # must have server, user, and pw
-      raise JSS::MissingDataError, "No JSS :server specified, or in configuration." unless args[:server]
-      raise JSS::MissingDataError, "No JSS :user specified, or in configuration." unless args[:user]
-      raise JSS::MissingDataError, "Missing :pw for user '#{args[:user]}'" unless args[:pw]
-      
-      # we're using ssl if 1) args[:use_ssl] is anything but false
-      # or 2) the port is the default casper ssl port.
-      args[:use_ssl] = (not args[:use_ssl] == false) or (args[:port] == SSL_PORT)
-      
-      # and here's the URL
-      ssl = args[:use_ssl] ? "s" : ''
-      @rest_url = URI::encode "http#{ssl}://#{args[:server]}:#{args[:port]}/#{RSRC_BASE}"
-
-
-      # prep the args for passing to RestClient::Resource
-      # if verify_cert is anything but false, we will verify
-      args[:verify_ssl] =  (args[:verify_cert] == false) ? OpenSSL::SSL::VERIFY_NONE : OpenSSL::SSL::VERIFY_PEER
-      
-      args[:password] = if args[:pw] == :prompt
-        JSS.prompt_for_password "Enter the password for JSS user #{args[:user]}@#{args[:server]}:"
-      elsif args[:pw].is_a?(Symbol) and args[:pw].to_s.start_with?('stdin')
-        args[:pw].to_s =~ /^stdin(\d+)$/
-        line = $1
-        line ||= 1
-        JSS.stdin line
-      else
-        args[:pw]
-      end
-      
-      # heres our connection
-      @cnx = RestClient::Resource.new("#{@rest_url}", args)
-
-      @jss_user = args[:user]
-      @server_host = args[:server]
-      @connected = true
-      @server = JSS::Server.new
-
-      if @server.version < JSS.parse_jss_version(JSS::MINIMUM_SERVER_VERSION)[:version]
-        raise JSS::UnsupportedError, "Your JSS Server version, #{@server.raw_version}, is to low. Must be #{JSS::MINIMUM_SERVER_VERSION} or higher."
-      end
-
-      return @connected ? @server_host : nil
-    end # connect
-
-    ###
-    ### Reset the response timeout for the rest connection
-    ###
-    ### @param timeout[Integer] the new timeout in seconds
-    ###
-    ### @return [void]
-    ###
-    def timeout= (timeout)
-      @cnx.options[:timeout] = timeout
-    end
-
-    ###
-    ### Reset the open-connection timeout for the rest connection
-    ###
-    ### @param timeout[Integer] the new timeout in seconds
-    ###
-    ### @return [void]
-    ###
-    def open_timeout= (timeout)
-      @cnx.options[:open_timeout] = timeout
-    end
-
-
-    ###
-    ### With a REST connection, there isn't any real "connection" to disconnect from
-    ### So to disconnect, we just unset all our credentials.
-    ###
-    ### @return [void]
-    ###
-    def disconnect
-      @jss_user = nil
-      @rest_url = nil
-      @server_host = nil
-      @cnx = nil
-      @connected = false
-    end # disconnect
-
-    ###
-    ### Get an arbitrary JSS resource
-    ###
-    ### The first argument is the resource to get (the part of the API url
-    ### after the 'JSSResource/' )
-    ###
-    ### By default we get the data in JSON, and parse it
-    ### into a ruby data structure (arrays, hashes, strings, etc)
-    ### with symbolized Hash keys.
-    ###
-    ### @param rsrc[String] the resource to get
-    ###   (the part of the API url after the 'JSSResource/' )
-    ###
-    ### @param format[Symbol] either ;json or :xml
-    ###  If the second argument is :xml, the XML data is returned as a String.
-    ###
-    ### @return [Hash,String] the result of the get
-    ###
-    def get_rsrc (rsrc, format = :json)
-      raise JSS::InvalidConnectionError, "Not Connected. Use JSS::API.connect first." unless @connected
-      rsrc = URI::encode rsrc
-      data = @cnx[rsrc].get(:accept => format)
-      return JSON.parse(data, :symbolize_names => true) if format == :json
-      data
-    end
-
-    ###
-    ### Change an existing JSS resource
-    ###
-    ### @param rsrc[String] the API resource being changed, the URL part after 'JSSResource/'
-    ###
-    ### @param xml[String] the xml specifying the changes.
-    ###
-    ### @return [String] the xml response from the server.
-    ###
-    def put_rsrc(rsrc,xml)
-      raise JSS::InvalidConnectionError, "Not Connected. Use JSS::API.connect first." unless @connected
-
-      ### convert CRs & to &#13;
-      xml.gsub!(/\r/, '&#13;')
-
-      ### send the data
-      @cnx[rsrc].put(xml, :content_type => 'text/xml')
-    end
-
-    ###
-    ### Create a new JSS resource
-    ###
-    ### @param rsrc[String] the API resource being created, the URL part after 'JSSResource/'
-    ###
-    ### @param xml[String] the xml specifying the new object.
-    ###
-    ### @return [String] the xml response from the server.
-    ###
-    def post_rsrc(rsrc,xml)
-      raise JSS::InvalidConnectionError, "Not Connected. Use JSS::API.connect first." unless @connected
-
-      ### convert CRs & to &#13;
-      xml.gsub!(/\r/, '&#13;')
-
-      ### send the data
-      @cnx[rsrc].post xml, :content_type => 'text/xml', :accept => :json
-    end #post_rsrc
-
-    ### Delete a resource from the JSS
-    ###
-    ### @param rsrc[String] the resource to create, the URL part after 'JSSResource/'
-    ###
-    ### @return [String] the xml response from the server.
-    ###
-    def delete_rsrc(rsrc)
-      raise JSS::InvalidConnectionError, "Not Connected. Use JSS::API.connect first." unless @connected
-      raise MissingDataError, "Missing :rsrc" if rsrc.nil?
-
-      ### delete the resource
-      @cnx[rsrc].delete
-
-    end #delete_rsrc
-    
-    
-    ### Test that a given hostname & port is a JSS API server
-    ###
-    ### @param server[String] The hostname to test, 
-    ###
-    ### @param port[Integer] The port to try connecting on
-    ###
-    ### @return [Boolean] does the server host a JSS API?
-    ###
-    def valid_server? (server, port = SSL_PORT)
-      # try ssl first
-      begin
-        return true if open("https://#{server}:#{port}/#{TEST_PATH}", ssl_verify_mode: OpenSSL::SSL::VERIFY_NONE).read.include? TEST_CONTENT
-      rescue
-        # then regular http
-        begin 
-          return true if open("http://#{server}:#{port}/#{TEST_PATH}").read.include? TEST_CONTENT
-        rescue
-          # any errors = no API
-          return false
-        end # begin
-      end #begin
-      # if we're here, no API
-      return false
-    end
-    
-    ### The server to which we are connected, or will 
-    ### try connecting to if none is specified with the
-    ### call to #connect
-    ###
-    ### @return [String] the hostname of the server
-    ###
-    def hostname
-      return @server_host if @server_host
-      srvr = JSS::CONFIG.api_server_name
-      srvr ||= JSS::Client.jss_server
-      return srvr
-    end
-    
-    ### aliases
-    alias connected? connected
-
-
-  end # class JSSAPIConnection
-
-  ### The single instance of the APIConnection
-  API = APIConnection.instance
-
-
-end # module