Commit b23891ec authored by Chris Price's avatar Chris Price

Fix all references to previously singular namespaces

Conflicts:
	src/com/puppetlabs/puppetdb/cli/export.clj
parent 2c77619b
(ns com.puppetlabs.puppetdb.anonymizer
(:require [com.puppetlabs.puppetdb.catalog :as catalog]
[com.puppetlabs.puppetdb.report :as report]
(:require [com.puppetlabs.puppetdb.catalogs :as catalog]
[com.puppetlabs.puppetdb.reports :as report]
[clojure.string :as string])
(:use [com.puppetlabs.concurrent :only (bounded-pmap)]
[com.puppetlabs.utils :only (regexp? boolean? uuid string-contains?)]
......
......@@ -5,7 +5,7 @@
(ns com.puppetlabs.puppetdb.catalog.utils
(:require [clojure.string :as string]
[com.puppetlabs.puppetdb.catalog :as cat])
[com.puppetlabs.puppetdb.catalogs :as cat])
(:use [com.puppetlabs.random :only [random-resource random-kw-resource random-parameters]]))
(defn add-random-resource-to-wire-catalog
......
......@@ -87,7 +87,7 @@
;; <dependency-spec>,
;; ...)}
;;
(ns com.puppetlabs.puppetdb.catalog
(ns com.puppetlabs.puppetdb.catalogs
(:require [clojure.string :as string]
[clojure.tools.logging :as log]
[clojure.set :as set]
......
......@@ -34,7 +34,7 @@
:post [((some-fn string? nil?) %)]}
(let [{:keys [status body]} (client/get
(format
"http://%s:%s/v3/catalog/%s"
"http://%s:%s/v3/catalogs/%s"
host port node)
{ :accept :json})]
(when (= status 200) body)))
......
......@@ -59,8 +59,8 @@
(ns com.puppetlabs.puppetdb.command
(:require [clojure.tools.logging :as log]
[com.puppetlabs.puppetdb.scf.storage :as scf-storage]
[com.puppetlabs.puppetdb.catalog :as cat]
[com.puppetlabs.puppetdb.report :as report]
[com.puppetlabs.puppetdb.catalogs :as cat]
[com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.puppetdb.command.dlo :as dlo]
[com.puppetlabs.mq :as mq]
[com.puppetlabs.utils :as pl-utils]
......
......@@ -31,7 +31,7 @@
(ns com.puppetlabs.puppetdb.http.v1.node
(:require [cheshire.core :as json]
[com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.node :as node]
[com.puppetlabs.puppetdb.query.nodes :as node]
[ring.util.response :as rr])
(:use [net.cgrand.moustache :only [app]]
com.puppetlabs.middleware
......
......@@ -67,7 +67,7 @@
(ns com.puppetlabs.puppetdb.http.v1.resources
(:require [com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.resource :as r]
[com.puppetlabs.puppetdb.query.resources :as r]
[cheshire.core :as json]
[ring.util.response :as rr])
(:use [net.cgrand.moustache :only [app]]
......
......@@ -4,7 +4,7 @@
;; spec](../spec/status.md).
(ns com.puppetlabs.puppetdb.http.v1.status
(:require [com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.node :as n]
[com.puppetlabs.puppetdb.query.nodes :as n]
[ring.util.response :as rr])
(:use com.puppetlabs.middleware
[net.cgrand.moustache :only (app)]
......
(ns com.puppetlabs.puppetdb.http.v2.node
(:require [com.puppetlabs.puppetdb.http.v3.node :as v3-node])
(:require [com.puppetlabs.puppetdb.http.v3.nodes :as v3-node])
(:use [com.puppetlabs.middleware :only (verify-accepts-json validate-query-params)]))
(def node-app
......
......@@ -2,13 +2,13 @@
(:use [com.puppetlabs.puppetdb.http.v3.command :only (command-app)]
[com.puppetlabs.puppetdb.http.v3.facts :only (facts-app)]
[com.puppetlabs.puppetdb.http.v3.fact-names :only (fact-names-app)]
[com.puppetlabs.puppetdb.http.v3.node :only (node-app)]
[com.puppetlabs.puppetdb.http.v3.nodes :only (node-app)]
[com.puppetlabs.puppetdb.http.v3.resources :only (resources-app)]
[com.puppetlabs.puppetdb.http.v3.metrics :only (metrics-app)]
[com.puppetlabs.puppetdb.http.v3.version :only (version-app)]
[com.puppetlabs.puppetdb.http.v3.catalog :only (catalog-app)]
[com.puppetlabs.puppetdb.http.v3.event :only (events-app)]
[com.puppetlabs.puppetdb.http.v3.report :only (reports-app)]
[com.puppetlabs.puppetdb.http.v3.catalogs :only (catalog-app)]
[com.puppetlabs.puppetdb.http.v3.events :only (events-app)]
[com.puppetlabs.puppetdb.http.v3.reports :only (reports-app)]
[com.puppetlabs.puppetdb.http.v3.event-counts :only (event-counts-app)]
[com.puppetlabs.puppetdb.http.v3.aggregate-event-counts :only (aggregate-event-counts-app)]
[net.cgrand.moustache :only (app)]))
......@@ -36,7 +36,7 @@
["version" &]
{:any version-app}
["catalog" &]
["catalogs" &]
{:any catalog-app}
["events" &]
......
(ns com.puppetlabs.puppetdb.http.v3.catalog
(ns com.puppetlabs.puppetdb.http.v3.catalogs
(:require [cheshire.core :as json]
[com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.catalog :as c]
[com.puppetlabs.puppetdb.query.catalogs :as c]
[ring.util.response :as rr])
(:use com.puppetlabs.middleware
[com.puppetlabs.jdbc :only (with-transacted-connection)]
......
......@@ -45,10 +45,10 @@
;; }
;; ]`
(ns com.puppetlabs.puppetdb.http.v3.event
(ns com.puppetlabs.puppetdb.http.v3.events
(:require [com.puppetlabs.http :as pl-http]
[com.puppetlabs.utils :as pl-utils]
[com.puppetlabs.puppetdb.query.event :as query]
[com.puppetlabs.puppetdb.query.events :as query]
[cheshire.core :as json]
[ring.util.response :as rr]
[com.puppetlabs.puppetdb.query.paging :as paging])
......
(ns com.puppetlabs.puppetdb.http.v3.node
(ns com.puppetlabs.puppetdb.http.v3.nodes
(:require [com.puppetlabs.puppetdb.query.paging :as paging]
[cheshire.core :as json]
[com.puppetlabs.puppetdb.query.node :as node]
[com.puppetlabs.puppetdb.query.nodes :as node]
[com.puppetlabs.puppetdb.http.v2.facts :as f]
[com.puppetlabs.puppetdb.http.v2.resources :as r]
[com.puppetlabs.puppetdb.http.query :as http-q]
......
......@@ -46,9 +46,9 @@
;; }
;;]`
(ns com.puppetlabs.puppetdb.http.v3.report
(ns com.puppetlabs.puppetdb.http.v3.reports
(:require [com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.report :as query]
[com.puppetlabs.puppetdb.query.reports :as query]
[ring.util.response :as rr]
[cheshire.core :as json]
[com.puppetlabs.puppetdb.query.paging :as paging])
......
......@@ -2,7 +2,7 @@
(:require [com.puppetlabs.puppetdb.http.query :as http-q]
[com.puppetlabs.puppetdb.query.paging :as paging]
[com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.query.resource :as r]
[com.puppetlabs.puppetdb.query.resources :as r]
[cheshire.core :as json])
(:use [net.cgrand.moustache :only [app]]
[com.puppetlabs.middleware :only (verify-accepts-json validate-query-params wrap-with-paging-options)]
......
......@@ -4,8 +4,8 @@
;; `documentation/api/wire_format/catalog_format.markdown`.
;;
(ns com.puppetlabs.puppetdb.query.catalog
(:require [com.puppetlabs.puppetdb.query.resource :as r])
(ns com.puppetlabs.puppetdb.query.catalogs
(:require [com.puppetlabs.puppetdb.query.resources :as r])
(:use [com.puppetlabs.jdbc :only [query-to-vec underscores->dashes]]
[com.puppetlabs.utils :only [dissoc-if-nil mapkeys]]))
......
(ns com.puppetlabs.puppetdb.query.event-counts
(:require [com.puppetlabs.puppetdb.query.event :as events]
(:require [com.puppetlabs.puppetdb.query.events :as events]
[clojure.string :as string])
(:use [com.puppetlabs.jdbc :only [valid-jdbc-query? dashes->underscores]]
[com.puppetlabs.puppetdb.query :only [compile-term execute-query]]
......
;; ## SQL/query-related functions for events
(ns com.puppetlabs.puppetdb.query.event
(ns com.puppetlabs.puppetdb.query.events
(:require [com.puppetlabs.utils :as utils]
[clojure.string :as string]
[cheshire.core :as json])
......
......@@ -3,7 +3,7 @@
;; This implements the node query operations according to the [node query
;; spec](../spec/node.md).
;;
(ns com.puppetlabs.puppetdb.query.node
(ns com.puppetlabs.puppetdb.query.nodes
(:refer-clojure :exclude [case compile conj! distinct disj! drop sort take])
(:require [clojure.string :as string])
(:use [com.puppetlabs.puppetdb.scf.storage :only [db-serialize sql-array-query-string sql-as-numeric]]
......
......@@ -10,7 +10,7 @@
;; <dependency-spec>}}
(ns com.puppetlabs.puppetdb.query.planetarium-catalog
(:refer-clojure :exclude [case compile conj! distinct disj! drop sort take])
(:require [com.puppetlabs.puppetdb.query.resource :as r])
(:require [com.puppetlabs.puppetdb.query.resources :as r])
(:use [com.puppetlabs.jdbc]
[com.puppetlabs.puppetdb.scf.storage :only [catalogs-for-certname]]
clojureql.core))
......
;; ## SQL/query-related functions for reports
(ns com.puppetlabs.puppetdb.query.report
(ns com.puppetlabs.puppetdb.query.reports
(:require [com.puppetlabs.utils :as utils]
[clojure.string :as string])
(:use [com.puppetlabs.jdbc :only [query-to-vec underscores->dashes valid-jdbc-query?]]
[com.puppetlabs.puppetdb.query :only [execute-query]]
[com.puppetlabs.puppetdb.query.event :only [events-for-report-hash]]
[com.puppetlabs.puppetdb.query.events :only [events-for-report-hash]]
[com.puppetlabs.puppetdb.query.paging :only [validate-order-by!]]))
;; ## Report query functions
......
......@@ -4,7 +4,7 @@
;; `com.puppetlabs.puppetdb.query`, basically by munging the results into the
;; right format and picking out the desired columns.
;;
(ns com.puppetlabs.puppetdb.query.resource
(ns com.puppetlabs.puppetdb.query.resources
(:require [cheshire.core :as json]
[clojure.string :as string])
(:use [com.puppetlabs.jdbc :only [limited-query-to-vec
......
......@@ -3,7 +3,7 @@
;; Functions that handle conversion of reports from wire format to
;; internal PuppetDB format, including validation.
(ns com.puppetlabs.puppetdb.report
(ns com.puppetlabs.puppetdb.reports
(:use [clj-time.coerce :only [to-timestamp]]
[com.puppetlabs.validation :only [defmodel validate-against-model!]]
[com.puppetlabs.puppetdb.command.constants :only [command-names]])
......
......@@ -19,8 +19,8 @@
;; up, it's important to run `garbage-collect!`.
(ns com.puppetlabs.puppetdb.scf.storage
(:require [com.puppetlabs.puppetdb.catalog :as cat]
[com.puppetlabs.puppetdb.report :as report]
(:require [com.puppetlabs.puppetdb.catalogs :as cat]
[com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.utils :as utils]
[com.puppetlabs.jdbc :as jdbc]
[clojure.java.jdbc :as sql]
......
(ns com.puppetlabs.puppetdb.examples
(:use [com.puppetlabs.puppetdb.catalog :only [catalog-version]]))
(:use [com.puppetlabs.puppetdb.catalogs :only [catalog-version]]))
(def catalogs
{:empty
......
(ns com.puppetlabs.puppetdb.examples.report
(ns com.puppetlabs.puppetdb.examples.reports
(:require [clj-time.coerce :as coerce]))
(def reports
......
(ns com.puppetlabs.puppetdb.test.catalog
(:use [com.puppetlabs.puppetdb.catalog]
(ns com.puppetlabs.puppetdb.test.catalogs
(:use [com.puppetlabs.puppetdb.catalogs]
[com.puppetlabs.puppetdb.catalog.utils]
[com.puppetlabs.puppetdb.examples]
[clojure.test]))
......
(ns com.puppetlabs.puppetdb.test.cli.export
(:require [com.puppetlabs.puppetdb.query.catalog :as c]
[com.puppetlabs.puppetdb.query.report :as r]
[com.puppetlabs.puppetdb.query.event :as e]
(:require [com.puppetlabs.puppetdb.query.catalogs :as c]
[com.puppetlabs.puppetdb.query.reports :as r]
[com.puppetlabs.puppetdb.query.events :as e]
[cheshire.core :as json]
[com.puppetlabs.puppetdb.testutils.catalog :as testcat]
[com.puppetlabs.puppetdb.testutils.report :as testrep])
[com.puppetlabs.puppetdb.testutils.catalogs :as testcat]
[com.puppetlabs.puppetdb.testutils.reports :as testrep])
(:use [clojure.java.io :only [resource]]
clojure.test
[com.puppetlabs.puppetdb.fixtures]))
......
......@@ -3,8 +3,8 @@
[clojure.java.jdbc :as sql]
[cheshire.core :as json]
[com.puppetlabs.puppetdb.scf.storage :as scf-store]
[com.puppetlabs.puppetdb.catalog :as catalog]
[com.puppetlabs.puppetdb.examples.report :as report-examples])
[com.puppetlabs.puppetdb.catalogs :as catalog]
[com.puppetlabs.puppetdb.examples.reports :as report-examples])
(:use [com.puppetlabs.puppetdb.command]
[com.puppetlabs.utils]
[com.puppetlabs.puppetdb.testutils]
......@@ -12,7 +12,7 @@
[com.puppetlabs.jdbc :only [query-to-vec]]
[com.puppetlabs.puppetdb.examples]
[com.puppetlabs.testutils.logging]
[com.puppetlabs.puppetdb.testutils.report :only [munge-example-report-for-storage]]
[com.puppetlabs.puppetdb.testutils.reports :only [munge-example-report-for-storage]]
[com.puppetlabs.puppetdb.command.constants :only [command-names]]
[clj-time.coerce :only [to-timestamp]]
[clojure.test]
......
......@@ -5,7 +5,7 @@
ring.mock.request
[com.puppetlabs.utils :only (keyset)]
com.puppetlabs.puppetdb.fixtures
[com.puppetlabs.puppetdb.testutils.node :only [store-example-nodes]]))
[com.puppetlabs.puppetdb.testutils.nodes :only [store-example-nodes]]))
(use-fixtures :each with-test-db with-http-app)
......
......@@ -4,9 +4,9 @@
(:use clojure.test
[clj-time.core :only [now]]
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils.event-counts :only [get-response]]
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]))
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]))
(use-fixtures :each with-test-db with-http-app)
......
(ns com.puppetlabs.puppetdb.test.http.v3.catalog
(ns com.puppetlabs.puppetdb.test.http.v3.catalogs
(:require [cheshire.core :as json]
[com.puppetlabs.puppetdb.testutils.catalog :as testcat])
[com.puppetlabs.puppetdb.testutils.catalogs :as testcat])
(:use [clojure.java.io :only [resource]]
clojure.test
ring.mock.request
......@@ -18,7 +18,7 @@
(defn get-response
([] (get-response nil))
([node] (*app* (get-request (str "/v3/catalog/" node)))))
([node] (*app* (get-request (str "/v3/catalogs/" node)))))
(deftest catalog-retrieval
......
......@@ -4,10 +4,10 @@
(:use clojure.test
[clj-time.core :only [now]]
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils.event-counts :only [get-response]]
[com.puppetlabs.puppetdb.testutils :only [response-equal? paged-results]]
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]))
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]))
(use-fixtures :each with-test-db with-http-app)
......
(ns com.puppetlabs.puppetdb.test.http.v3.event
(:require [com.puppetlabs.puppetdb.report :as report]
(ns com.puppetlabs.puppetdb.test.http.v3.events
(:require [com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.utils :as utils]
[com.puppetlabs.http :as pl-http]
[com.puppetlabs.puppetdb.scf.storage :as scf-store]
......@@ -7,12 +7,12 @@
(:use clojure.test
[clojure.walk :only [stringify-keys]]
ring.mock.request
com.puppetlabs.puppetdb.examples.report
com.puppetlabs.puppetdb.examples.reports
com.puppetlabs.puppetdb.fixtures
[clj-time.core :only [now]]
[clj-time.coerce :only [to-string to-long]]
[com.puppetlabs.puppetdb.testutils :only (response-equal? assert-success! get-request paged-results)]
[com.puppetlabs.puppetdb.testutils.report :only (store-example-report! get-events-map)]))
[com.puppetlabs.puppetdb.testutils.reports :only (store-example-report! get-events-map)]))
(def content-type-json pl-http/json-response-content-type)
......
(ns com.puppetlabs.puppetdb.test.http.v3.node
(ns com.puppetlabs.puppetdb.test.http.v3.nodes
(:require [cheshire.core :as json]
[com.puppetlabs.http :as pl-http])
(:use clojure.test
ring.mock.request
[com.puppetlabs.puppetdb.fixtures]
[com.puppetlabs.puppetdb.testutils :only [assert-success! get-request paged-results]]
[com.puppetlabs.puppetdb.testutils.node :only [store-example-nodes]]))
[com.puppetlabs.puppetdb.testutils.nodes :only [store-example-nodes]]))
(use-fixtures :each with-test-db with-http-app)
......
(ns com.puppetlabs.puppetdb.test.http.v3.report
(ns com.puppetlabs.puppetdb.test.http.v3.reports
(:require [cheshire.core :as json]
[com.puppetlabs.puppetdb.scf.storage :as scf-store]
[com.puppetlabs.puppetdb.report :as report]
[com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.utils :as utils])
(:use clojure.test
ring.mock.request
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils :only (response-equal? assert-success! get-request paged-results)]
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]
[clj-time.coerce :only [to-date-time to-string]]
[clj-time.core :only [now]]))
......
......@@ -2,8 +2,8 @@
(:require [com.puppetlabs.puppetdb.query.aggregate-event-counts :as aggregate-event-counts])
(:use clojure.test
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]
[clj-time.core :only [now]]))
(use-fixtures :each with-test-db)
......
(ns com.puppetlabs.puppetdb.test.query.catalog
(:require [com.puppetlabs.puppetdb.examples :as examples]
[com.puppetlabs.puppetdb.query.catalog :as c]
[com.puppetlabs.puppetdb.testutils.catalog :as testcat]
[cheshire.core :as json])
(ns com.puppetlabs.puppetdb.test.query.catalogs
(:require [com.puppetlabs.puppetdb.examples :as examples]
[com.puppetlabs.puppetdb.query.catalogs :as c]
[com.puppetlabs.puppetdb.testutils.catalogs :as testcat]
[cheshire.core :as json])
(:use clojure.test
com.puppetlabs.puppetdb.fixtures
[clj-time.core :only [now]]
......
......@@ -2,8 +2,8 @@
(:require [com.puppetlabs.puppetdb.query.event-counts :as event-counts])
(:use clojure.test
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]
[clj-time.core :only [now]]))
(use-fixtures :each with-test-db)
......
(ns com.puppetlabs.puppetdb.test.query.event
(ns com.puppetlabs.puppetdb.test.query.events
(:require [com.puppetlabs.puppetdb.scf.storage :as scf-store]
[com.puppetlabs.puppetdb.report :as report]
[com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.puppetdb.query :as query]
[com.puppetlabs.puppetdb.query.event :as event-query]
[com.puppetlabs.puppetdb.query.events :as event-query]
[com.puppetlabs.utils :as utils])
(:use clojure.test
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report! get-events-map]]
com.puppetlabs.puppetdb.testutils.event
com.puppetlabs.puppetdb.examples.reports
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report! get-events-map]]
com.puppetlabs.puppetdb.testutils.events
[clj-time.coerce :only [to-string to-timestamp to-long]]
[clj-time.core :only [now ago days]]))
......
(ns com.puppetlabs.puppetdb.test.query.node
(ns com.puppetlabs.puppetdb.test.query.nodes
(:require [clojure.set :as set]
[com.puppetlabs.puppetdb.query.node :as node]
[com.puppetlabs.puppetdb.query.nodes :as node]
[clojure.java.jdbc :as sql])
(:use clojure.test
[clj-time.core :only [now]]
......
(ns com.puppetlabs.puppetdb.test.query.report
(:require [com.puppetlabs.puppetdb.query.report :as query])
(ns com.puppetlabs.puppetdb.test.query.reports
(:require [com.puppetlabs.puppetdb.query.reports :as query])
(:use clojure.test
com.puppetlabs.puppetdb.fixtures
com.puppetlabs.puppetdb.examples.report
com.puppetlabs.puppetdb.testutils.report
com.puppetlabs.puppetdb.examples.reports
com.puppetlabs.puppetdb.testutils.reports
[com.puppetlabs.time :only [to-secs]]
[clj-time.core :only [now ago days]]))
......
(ns com.puppetlabs.puppetdb.test.query.resource
(:require [com.puppetlabs.puppetdb.query.resource :as s]
(ns com.puppetlabs.puppetdb.test.query.resources
(:require [com.puppetlabs.puppetdb.query.resources :as s]
[clojure.java.jdbc :as sql]
[clojure.string :as string])
(:use clojure.test
......
(ns com.puppetlabs.puppetdb.test.report
(ns com.puppetlabs.puppetdb.test.reports
(:use [clojure.test]
[clj-time.coerce :only [to-timestamp]]
[com.puppetlabs.puppetdb.examples.report]
[com.puppetlabs.puppetdb.report]
[com.puppetlabs.puppetdb.testutils.report
[com.puppetlabs.puppetdb.examples.reports]
[com.puppetlabs.puppetdb.reports]
[com.puppetlabs.puppetdb.testutils.reports
:only [munge-example-report-for-storage
munge-v2-example-report-to-v1
munge-v1-example-report-to-v2]])
......
......@@ -9,8 +9,8 @@
[com.puppetlabs.utils :only [mapvals]]
[com.puppetlabs.jdbc :only [query-to-vec with-transacted-connection]]
[com.puppetlabs.puppetdb.testutils :only [clear-db-for-testing! test-db]]
[com.puppetlabs.puppetdb.examples.report]
[com.puppetlabs.puppetdb.testutils.report :only [store-example-report!]]))
[com.puppetlabs.puppetdb.examples.reports]
[com.puppetlabs.puppetdb.testutils.reports :only [store-example-report!]]))
(def db (test-db))
......
......@@ -2,14 +2,14 @@
(:require [com.puppetlabs.puppetdb.catalog.utils :as catutils]
[com.puppetlabs.random :as random]
[com.puppetlabs.puppetdb.report.utils :as reputils]
[com.puppetlabs.puppetdb.report :as report-val]
[com.puppetlabs.puppetdb.reports :as report-val]
[clojure.java.jdbc :as sql]
[cheshire.core :as json])
(:use [com.puppetlabs.puppetdb.examples :only [catalogs]]
[com.puppetlabs.puppetdb.examples.report :only [reports]]
[com.puppetlabs.puppetdb.testutils.report]
[com.puppetlabs.puppetdb.testutils.event]
[com.puppetlabs.puppetdb.query.report :only [is-latest-report?]]
[com.puppetlabs.puppetdb.examples.reports :only [reports]]
[com.puppetlabs.puppetdb.testutils.reports]
[com.puppetlabs.puppetdb.testutils.events]
[com.puppetlabs.puppetdb.query.reports :only [is-latest-report?]]
[com.puppetlabs.puppetdb.scf.storage]
[com.puppetlabs.puppetdb.scf.migrate :only [migrate!]]
[clojure.test]
......
(ns com.puppetlabs.puppetdb.testutils.catalog
(ns com.puppetlabs.puppetdb.testutils.catalogs
(:require [com.puppetlabs.puppetdb.command :as command]
[cheshire.core :as json])
(:use [com.puppetlabs.utils :only [uuid]]
......@@ -6,7 +6,7 @@
[com.puppetlabs.puppetdb.testutils :only [test-db]]
[com.puppetlabs.puppetdb.fixtures :only [*db*]]
[com.puppetlabs.puppetdb.command.constants :only [command-names]]
[com.puppetlabs.puppetdb.catalog :only [catalog-version]]))
[com.puppetlabs.puppetdb.catalogs :only [catalog-version]]))
(defn munge-resource-for-comparison
......
(ns com.puppetlabs.puppetdb.testutils.event
(:require [com.puppetlabs.puppetdb.query.event :as query]
[com.puppetlabs.puppetdb.report :as report])
(ns com.puppetlabs.puppetdb.testutils.events
(:require [com.puppetlabs.puppetdb.query.events :as query]
[com.puppetlabs.puppetdb.reports :as report])
(:use [clj-time.coerce :only [to-timestamp]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
......
(ns com.puppetlabs.puppetdb.testutils.node
(ns com.puppetlabs.puppetdb.testutils.nodes
(:require [com.puppetlabs.puppetdb.scf.storage :as scf-store])
(:use [com.puppetlabs.puppetdb.examples]
[clj-time.core :only [now]]))
......
(ns com.puppetlabs.puppetdb.testutils.report
(ns com.puppetlabs.puppetdb.testutils.reports
(:require [com.puppetlabs.puppetdb.scf.storage :as scf-store]
[com.puppetlabs.puppetdb.report :as report]
[com.puppetlabs.puppetdb.reports :as report]
[com.puppetlabs.utils :as utils]
[com.puppetlabs.puppetdb.query.report :as query]
[com.puppetlabs.puppetdb.query.reports :as query]
[clj-time.coerce :as time-coerce])
(:use [com.puppetlabs.puppetdb.testutils.event :only [munge-example-event-for-storage
munge-v2-example-events-to-v1
munge-v1-example-events-to-v2]]))
(:use [com.puppetlabs.puppetdb.testutils.events :only [munge-example-event-for-storage
munge-v2-example-events-to-v1
munge-v1-example-events-to-v2]]))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Utility functions for massaging results and example data into formats that
......
(ns com.puppetlabs.test.validation
(:use clojure.test
com.puppetlabs.validation
com.puppetlabs.puppetdb.examples.report))
com.puppetlabs.puppetdb.examples.reports))
(deftest defining-models
(defmodel TestModel
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment