upguard 0.0.3 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84863a2eb3a24e4e56d9f29c18c23017058b037f
-  data.tar.gz: 74c848cc0e8289fdd8f7f65e2f41f60cf01af0f7
+SHA256:
+  metadata.gz: 02c8e4f7f0d117e6f9f7e396b7188c7f0a75221dd4ba8bea61633e3405e3e56a
+  data.tar.gz: 610294a9da4ecbd52eacba9b92c0b6eed17e38a10d0531955e9dd435fed5b53c
 SHA512:
-  metadata.gz: 49064d986ecd8fa1124fda08af64eb0266436149458fddf3612c806e5d37dae6e7c33bc2568bb03d6422b3b247f6b6835d7f9c6bc07c4c64ea641e88a6dd7fe2
-  data.tar.gz: e9de7224ab8cd38f0a00ae75d234b263be9db5ee211330bc66c60aff9acd1279d2b73ba3fc803a0cce3eabf0a48b7b4fdbd50f929ee25358422ec4234ace4e17
+  metadata.gz: 80857243f93931a9d59229f966a3c997a790c03a923112d3b26425106cae64832eb0778cbf3c70ffb24464f74f0f715ae31f22138744acf45add1877435d1aa7
+  data.tar.gz: 6cdb09dffdeeb6c662442b676c14fe94b85648d9bf9df928689860a268f08171f94105585434792e62632e06eaf82467a05a373dbfcebddcad7efa5db96d08f9

data/lib/upguard.rb

@@ -1,17 +1,42 @@
 require_relative 'upguard/BaseObject'
+require_relative 'upguard/Version'
 require_relative 'upguard/Account'
+require_relative 'upguard/ChangeRequest'
+require_relative 'upguard/ChangeRequestList'
 require_relative 'upguard/ConnectionManager'
+require_relative 'upguard/ConnectionManagerList'
 require_relative 'upguard/ConnectionManagerGroup'
+require_relative 'upguard/ConnectionManagerGroupList'
 require_relative 'upguard/Environment'
+require_relative 'upguard/EnvironmentList'
+require_relative 'upguard/ExternalEvent'
 require_relative 'upguard/Event'
+require_relative 'upguard/EventList'
+require_relative 'upguard/EventVariables'
 require_relative 'upguard/EventAction'
+require_relative 'upguard/EventActionList'
 require_relative 'upguard/Incident'
+require_relative 'upguard/IncidentList'
+require_relative 'upguard/Job'
+require_relative 'upguard/JobList'
 require_relative 'upguard/MediumType'
 require_relative 'upguard/Node'
+require_relative 'upguard/NodeList'
 require_relative 'upguard/NodeGroup'
+require_relative 'upguard/NodeGroupList'
+require_relative 'upguard/NodeGroupUser'
+require_relative 'upguard/NodeGroupUserList'
+require_relative 'upguard/NodeMediumInfo'
 require_relative 'upguard/NodeType'
 require_relative 'upguard/OperatingSystem'
+require_relative 'upguard/OperatingSystemList'
 require_relative 'upguard/OperatingSystemFamily'
+require_relative 'upguard/OperatingSystemFamilyList'
+require_relative 'upguard/Policy'
+require_relative 'upguard/PolicyList'
 require_relative 'upguard/ScheduledJob'
+require_relative 'upguard/ScheduledJobList'
 require_relative 'upguard/SystemMetric'
+require_relative 'upguard/SystemMetricList'
 require_relative 'upguard/User'
+require_relative 'upguard/UserList'

data/lib/upguard/Account.rb

@@ -12,221 +12,488 @@ module UpGuard
       h['name'] = self.name
       return h
     end
-    def to_json
+    def to_json(options = nil)
       h = to_hash
-      return h.to_json
+      return h.to_json(options)
     end
     
+    def change_request_by_id(id)
+      obj = http_get("/api/v2/change_requests/#{id}.json")
+      elem = ChangeRequest.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.external_id = obj["external_id"]
+        elem.id = obj["id"]
+        elem.planned_end_date = obj["planned_end_date"]
+        elem.planned_start_date = obj["planned_start_date"]
+        elem.short_description = obj["short_description"]
+        elem.started_at = obj["started_at"]
+        elem.ended_at = obj["ended_at"]
+      return elem
+    end
+
+    
+    def change_requests
+      obj = http_get("/api/v2/change_requests.json")
+      the_list = ChangeRequestList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = ChangeRequest.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        elem.id = x["id"] if x.include?("id")
+        elem.planned_end_date = x["planned_end_date"] if x.include?("planned_end_date")
+        elem.planned_start_date = x["planned_start_date"] if x.include?("planned_start_date")
+        elem.short_description = x["short_description"] if x.include?("short_description")
+        elem.started_at = x["started_at"] if x.include?("started_at")
+        elem.ended_at = x["ended_at"] if x.include?("ended_at")
+        the_list << elem
+      end
+      return the_list
+    end
+
+    def new_connection_manager_group
+      return ConnectionManagerGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
+    
     def connection_managers
       obj = http_get("/api/v2/connection_managers.json")
-      list = []
+      the_list = ConnectionManagerList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ConnectionManager.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.hostname = x["hostname"]
-        elem.last_contact = x["last_contact"]
-        list << elem
+        elem = ConnectionManager.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.channels = x["channels"] if x.include?("channels")
+        elem.connection_manager_group_id = x["connection_manager_group_id"] if x.include?("connection_manager_group_id")
+        elem.created_at = x["created_at"] if x.include?("created_at")
+        elem.hostname = x["hostname"] if x.include?("hostname")
+        elem.id = x["id"] if x.include?("id")
+        elem.last_contact = x["last_contact"] if x.include?("last_contact")
+        elem.stats = x["stats"] if x.include?("stats")
+        elem.updated_at = x["updated_at"] if x.include?("updated_at")
+        the_list << elem
       end
-      return list
+      return the_list
     end
 
     
     def connection_manager_groups
       obj = http_get("/api/v2/connection_manager_groups.json")
-      list = []
+      the_list = ConnectionManagerGroupList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = ConnectionManagerGroup.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        list << elem
+        elem = ConnectionManagerGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.organisation_id = x["organisation_id"] if x.include?("organisation_id")
+        elem.status = x["status"] if x.include?("status")
+        the_list << elem
       end
-      return list
+      return the_list
     end
 
     def new_environment
-      return Environment.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
+      return Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
+    
+    def environment_by_id(id)
+      obj = http_get("/api/v2/environments/#{id}.json")
+      elem = Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+      return elem
     end
 
     
     def environments
       obj = http_get("/api/v2/environments.json")
-      list = []
+      the_list = EnvironmentList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Environment.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        list << elem
+        elem = Environment.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.description = x["description"] if x.include?("description")
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.node_rules = x["node_rules"] if x.include?("node_rules")
+        elem.short_description = x["short_description"] if x.include?("short_description")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    def new_external_event
+      return ExternalEvent.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
     end
 
     def events_with_view_name(view_name)
     url = "/api/v2/events.json?view_name=#{view_name}"
       obj = http_get(url)
-      list = []
+      the_list = EventList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure
       obj.each do |x|
-        elem = Event.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
+        elem = Event.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"]
         elem.type_id = x["type_id"]
         elem.environment_id = x["environment_id"]
         elem.created_at = x["created_at"]
-        list << elem
+        the_list << elem
       end
-      return list
+      return the_list
     end
 
     def events_with_query(query)
     url = "/api/v2/events.json?query=#{query}"
       obj = http_get(url)
-      list = []
+      the_list = EventList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure
       obj.each do |x|
-        elem = Event.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
+        elem = Event.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
         elem.id = x["id"]
         elem.type_id = x["type_id"]
         elem.environment_id = x["environment_id"]
         elem.created_at = x["created_at"]
-        list << elem
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def event_action_by_id(id)
+      obj = http_get("/api/v2/event_actions/#{id}.json")
+      elem = EventAction.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+      return elem
+    end
+
+    
+    def event_types
+      obj = http_get("/api/v2/events/types.json")
+      the_list = EventTypeList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = EventType.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        the_list << elem
+      end
+      return the_list
     end
 
     
     def event_actions
       obj = http_get("/api/v2/event_actions.json")
-      list = []
+      the_list = EventActionList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = EventAction.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        elem.status = x["status"]
-        elem.type = x["type"]
-        list << elem
+        elem = EventAction.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.status = x["status"] if x.include?("status")
+        elem.type = x["type"] if x.include?("type")
+        elem.variables = x["variables"] if x.include?("variables")
+        elem.view = x["view"] if x.include?("view")
+        the_list << elem
       end
-      return list
+      return the_list
     end
 
     
     def incidents
       obj = http_get("/api/v2/incidents.json")
-      list = []
+      the_list = IncidentList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Incident.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.external_id = x["external_id"]
-        elem.short_description = x["short_description"]
-        elem.started_at = x["started_at"]
-        elem.ended_at = x["ended_at"]
-        elem.url = x["url"]
-        list << elem
+        elem = Incident.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        elem.short_description = x["short_description"] if x.include?("short_description")
+        elem.started_at = x["started_at"] if x.include?("started_at")
+        elem.ended_at = x["ended_at"] if x.include?("ended_at")
+        elem.url = x["url"] if x.include?("url")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def incident_by_id(id)
+      obj = http_get("/api/v2/incidents/#{id}.json")
+      elem = Incident.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.external_id = obj["external_id"]
+        elem.short_description = obj["short_description"]
+        elem.started_at = obj["started_at"]
+        elem.ended_at = obj["ended_at"]
+        elem.url = obj["url"]
+      return elem
     end
 
     
     def jobs
       obj = http_get("/api/v2/jobs.json")
-      list = []
+      the_list = JobList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Job.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.organisation_id = x["organisation_id"]
-        elem.source_id = x["source_id"]
-        elem.source_type = x["source_type"]
-        elem.status = x["status"]
-        list << elem
+        elem = Job.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.source_id = x["source_id"] if x.include?("source_id")
+        elem.source_name = x["source_name"] if x.include?("source_name")
+        elem.source_type = x["source_type"] if x.include?("source_type")
+        elem.status = x["status"] if x.include?("status")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def job_by_id(id)
+      obj = http_get("/api/v2/jobs/#{id}.json")
+      elem = Job.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.source_id = obj["source_id"]
+        elem.source_name = obj["source_name"]
+        elem.source_type = obj["source_type"]
+        elem.status = obj["status"]
+      return elem
     end
 
     def new_node
-      return Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
+      return Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
     end
 
     
     def nodes
       obj = http_get("/api/v2/nodes.json")
-      list = []
+      the_list = NodeList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        elem.external_id = x["external_id"]
-        elem.environment_id = x["environment_id"]
-        elem.operating_system_family_id = x["operating_system_family_id"]
-        elem.operating_system_id = x["operating_system_id"]
-        list << elem
+        elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.connection_manager_group_id = x["connection_manager_group_id"] if x.include?("connection_manager_group_id")
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        elem.environment_id = x["environment_id"] if x.include?("environment_id")
+        elem.id = x["id"] if x.include?("id")
+        elem.ip_address = x["ip_address"] if x.include?("ip_address")
+        elem.last_scan_status = x["last_scan_status"] if x.include?("last_scan_status")
+        elem.last_scan_status_string = x["last_scan_status_string"] if x.include?("last_scan_status_string")
+        elem.mac_address = x["mac_address"] if x.include?("mac_address")
+        elem.medium_hostname = x["medium_hostname"] if x.include?("medium_hostname")
+        elem.medium_port = x["medium_port"] if x.include?("medium_port")
+        elem.medium_type = x["medium_type"] if x.include?("medium_type")
+        elem.medium_username = x["medium_username"] if x.include?("medium_username")
+        elem.name = x["name"] if x.include?("name")
+        elem.node_type = x["node_type"] if x.include?("node_type")
+        elem.online = x["online"] if x.include?("online")
+        elem.operating_system_family_id = x["operating_system_family_id"] if x.include?("operating_system_family_id")
+        elem.operating_system_id = x["operating_system_id"] if x.include?("operating_system_id")
+        elem.short_description = x["short_description"] if x.include?("short_description")
+        elem.medium_info.from_dict(x["medium_info"]) if x.include?("medium_info")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    def node_by_external_id(external_id)
+      url = "/api/v2/nodes/lookup.json?external_id=#{external_id}"
+      obj = http_get(url)
+      id = obj["node_id"]
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      elem.id = id
+      elem.load
+      return elem
+    end
+
+    def node_by_name(name)
+      url = "/api/v2/nodes/lookup.json?name=#{name}"
+      obj = http_get(url)
+      id = obj["node_id"]
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      elem.id = id
+      elem.load
+      return elem
+    end
+
+    
+    def node_by_id(id)
+      obj = http_get("/api/v2/nodes/#{id}.json")
+      elem = Node.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+      return elem
+    end
+
+    def new_node_group
+      return NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
     end
 
     
     def node_groups
       obj = http_get("/api/v2/node_groups.json")
-      list = []
+      the_list = NodeGroupList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        list << elem
+        elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.description = x["description"] if x.include?("description")
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.node_rules = x["node_rules"] if x.include?("node_rules")
+        elem.search_query = x["search_query"] if x.include?("search_query")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def node_group_by_id(id)
+      obj = http_get("/api/v2/node_groups/#{id}.json")
+      elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+      return elem
+    end
+
+    def node_group_by_name(name)
+      url = "/api/v2/node_groups/lookup.json?name=#{name}"
+      obj = http_get(url)
+      id = obj["node_group_id"]
+      elem = NodeGroup.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      elem.id = id
+      elem.load
+      return elem
+    end
+
+    
+    def node_scan_by_id(id)
+      obj = http_get("/api/v2/node_scans/#{id}.json")
+      elem = NodeScan.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = obj["id"]
+        elem.node_id = obj["node_id"]
+        elem.data = obj["data"]
+        elem.scan_options = obj["scan_options"]
+        elem.created_at = obj["created_at"]
+        elem.updated_at = obj["updated_at"]
+        elem.task_id = obj["task_id"]
+        elem.associated_id = obj["associated_id"]
+        elem.category = obj["category"]
+        elem.label = obj["label"]
+        elem.tsv = obj["tsv"]
+      return elem
     end
 
     
     def operating_system_families
       obj = http_get("/api/v2/operating_system_families.json")
-      list = []
+      the_list = OperatingSystemFamilyList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = OperatingSystemFamily.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        list << elem
+        elem = OperatingSystemFamily.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        the_list << elem
       end
-      return list
+      return the_list
     end
 
     
     def operating_systems
       obj = http_get("/api/v2/operating_systems.json")
-      list = []
+      the_list = OperatingSystemList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = OperatingSystem.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        elem.operating_system_family_id = x["operating_system_family_id"]
-        list << elem
+        elem = OperatingSystem.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.operating_system_family_id = x["operating_system_family_id"] if x.include?("operating_system_family_id")
+        elem.description = x["description"] if x.include?("description")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    def new_policy
+      return Policy.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+    end
+
+    
+    def policies
+      obj = http_get("/api/v2/policies.json")
+      the_list = PolicyList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = Policy.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.description = x["description"] if x.include?("description")
+        elem.id = x["id"] if x.include?("id")
+        elem.name = x["name"] if x.include?("name")
+        elem.short_description = x["short_description"] if x.include?("short_description")
+        the_list << elem
+      end
+      return the_list
+    end
+
+    
+    def scheduled_jobs
+      obj = http_get("/api/v2/scheduled_jobs.json")
+      the_list = ScheduledJobList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = ScheduledJob.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.data = x["data"] if x.include?("data")
+        elem.id = x["id"] if x.include?("id")
+        elem.source_id = x["source_id"] if x.include?("source_id")
+        elem.source_name = x["source_name"] if x.include?("source_name")
+        elem.source_type = x["source_type"] if x.include?("source_type")
+        elem.status = x["status"] if x.include?("status")
+        the_list << elem
+      end
+      return the_list
     end
 
     
     def system_metrics
       obj = http_get("/api/v2/system_metrics.json")
-      list = []
+      the_list = SystemMetricList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = SystemMetric.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.metric = x["metric"]
-        elem.value = x["value"]
-        elem.timestamp = x["timestamp"]
-        list << elem
+        elem = SystemMetric.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.metric = x["metric"] if x.include?("metric")
+        elem.value = x["value"] if x.include?("value")
+        elem.timestamp = x["timestamp"] if x.include?("timestamp")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def text_file_by_id(id)
+      obj = http_get("/api/v2/text_files/#{id}.json")
+      elem = TextFile.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.category = obj["category"]
+        elem.checksum = obj["checksum"]
+        elem.created_at = obj["created_at"]
+        elem.data = obj["data"]
+        elem.id = obj["id"]
+        elem.name = obj["name"]
+        elem.updated_at = obj["updated_at"]
+      return elem
     end
 
     
     def users
       obj = http_get("/api/v2/users.json")
-      list = []
+      the_list = UserList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
       obj.each do |x|
-        elem = User.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-        elem.id = x["id"]
-        elem.name = x["name"]
-        elem.surname = x["surname"]
-        elem.email = x["email"]
-        elem.role = x["role"]
-        list << elem
+        elem = User.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.email = x["email"] if x.include?("email")
+        elem.id = x["id"] if x.include?("id")
+        elem.last_sign_in_at = x["last_sign_in_at"] if x.include?("last_sign_in_at")
+        elem.name = x["name"] if x.include?("name")
+        elem.role = x["role"] if x.include?("role")
+        elem.surname = x["surname"] if x.include?("surname")
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        the_list << elem
       end
-      return list
+      return the_list
+    end
+
+    
+    def users_and_invitees
+      obj = http_get("/api/v2/users.json?invited=true")
+      the_list = UserList.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+      obj.each do |x|
+        elem = User.new(self.appliance_url, self.appliance_api_key, self.sec_key, self.insecure)
+        elem.email = x["email"] if x.include?("email")
+        elem.expiry = x["expiry"] if x.include?("expiry")
+        elem.id = x["id"] if x.include?("id")
+        elem.invited = x["invited"] if x.include?("invited")
+        elem.last_sign_in_at = x["last_sign_in_at"] if x.include?("last_sign_in_at")
+        elem.name = x["name"] if x.include?("name")
+        elem.role = x["role"] if x.include?("role")
+        elem.surname = x["surname"] if x.include?("surname")
+        elem.external_id = x["external_id"] if x.include?("external_id")
+        the_list << elem
+      end
+      return the_list
     end
 
     def invite_user(email, role)
@@ -235,32 +502,10 @@ module UpGuard
       return obj
     end
 
-    def find_node_by_external_id(external_id)
-      url = "/api/v2/nodes/lookup.json?external_id=#{external_id}"
-      obj = http_get(url)
-      id = obj["node_id"]
-      elem = Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-      elem.id = id
-      elem.load
-      return elem
-    end
-
-    def find_node_by_name(name)
-      url = "/api/v2/nodes/lookup.json?name=#{name}"
-      obj = http_get(url)
-      id = obj["node_id"]
-      elem = Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-      elem.id = id
-      elem.load
-      return elem
-    end
-
-    def find_node_by_id(id)
-      url = "/api/v2/nodes/#{self.id}.json?id=#{id}"
-      obj = http_get(url)
-      elem = Node.new(self.appliance_hostname, self.api_key, self.sec_key, self.insecure)
-      elem.from_hash(obj)
-      return elem
+    def remove_user(email)
+      url = "/api/v2/users/remove.json?email=#{email}"
+      obj = http_put(url, nil)
+      return obj
     end