openshift_client 0.0.6 → 0.0.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/openshift_client.rb +2 -2
  3. data/lib/openshift_client/version.rb +1 -1
  4. data/test/json/project_b1.json +23 -12
  5. data/test/json/project_list_b1.json +120 -31
  6. data/test/json/route_b1.json +26 -14
  7. data/test/test_client.rb +1 -1
  8. data/test/test_project.rb +8 -8
  9. data/test/test_route.rb +4 -4
  10. metadata +19 -19
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 86b3f31914a5fdf46f7fd0b04db4ce118e4dc4f7
4
- data.tar.gz: cad46b1d14c6405a68d0ee4ff13ef3a784302e35
3
+ metadata.gz: 34bd2729a966c5256a6fadc5fdc91adeae1e208c
4
+ data.tar.gz: d780e38580028882c93f66e284cc06e74e57fe06
5
5
  SHA512:
6
- metadata.gz: 67b4550da90b2d1f40ae53441b8421bf04f5068b64ec46ae21a47ec039299bfe4d073a4324e7e2318cc1e8b41c447afc090ccaa408398ba364f73bae7858f365
7
- data.tar.gz: d88fa0273cf2b423eadb4a9fae55fe1f7d3cc7d88fbb405218bcd149e762112479977221c20fa5b8425054bb778bdca72f78c17c8508f65be88441b1a8867949
6
+ metadata.gz: 84230f05d43ead506bce0d562bde8f1c1c738497f909bee71e1126497e76e1e2a693f74a95b35e834e5d7f0e87203def77c8e36234f2a897302e5feeee826de1
7
+ data.tar.gz: fc35aaf78df8147411fe1c224eeb06afa369e8abe409a10461275ee7a4793083390be8aee718b7e0e093c252072be992a5e2b46b6f00c98aa81a5bf34e83a4d5
data/lib/openshift_client.rb CHANGED
@@ -20,8 +20,8 @@ module OpenshiftClient
20
20
  [OpenshiftClient.const_set(et, Class.new(RecursiveOpenStruct)), et]
21
21
  end
22
22
 
23
- def initialize(uri, version = 'v1beta1')
24
- handle_uri(uri, '/osapi')
23
+ def initialize(uri, version = 'v1', path = 'oapi')
24
+ handle_uri(uri, path)
25
25
  @api_version = version
26
26
  @headers = {}
27
27
  ssl_options
data/lib/openshift_client/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # Openshift REST-API Client
2
2
  module OpenshiftClient
3
- VERSION = '0.0.6'
3
+ VERSION = '0.0.7'
4
4
  end
data/test/json/project_b1.json CHANGED
@@ -1,15 +1,26 @@
1
1
  {
2
- "kind": "Project",
3
- "apiVersion": "v1beta1",
4
- "metadata": {
5
- "name": "master",
6
- "selfLink": "/osapi/v1beta1/projects/master",
7
- "uid": "80359e00-d874-11e4-b110-f8b156af4ae1",
8
- "resourceVersion": "36",
9
- "creationTimestamp": "2015-04-01T13:39:20Z"
10
- },
11
- "spec": {},
12
- "status": {
13
- "phase": "Active"
2
+ "kind": "Project",
3
+ "apiVersion": "v1",
4
+ "metadata": {
5
+ "name": "test",
6
+ "selfLink": "/oapi/v1/projects/test",
7
+ "uid": "2626e632-2491-11e5-9fe4-727174f8ab71",
8
+ "resourceVersion": "241",
9
+ "creationTimestamp": "2015-07-07T10:15:53Z",
10
+ "annotations": {
11
+ "openshift.io/description": "",
12
+ "openshift.io/display-name": "",
13
+ "openshift.io/sa.scc.mcs": "s0:c6,c0",
14
+ "openshift.io/sa.scc.uid-range": "1000030000/10000"
14
15
  }
16
+ },
17
+ "spec": {
18
+ "finalizers": [
19
+ "openshift.io/origin",
20
+ "kubernetes"
21
+ ]
22
+ },
23
+ "status": {
24
+ "phase": "Active"
25
+ }
15
26
  }
data/test/json/project_list_b1.json CHANGED
@@ -1,35 +1,124 @@
1
1
  {
2
- "kind": "ProjectList",
3
- "apiVersion": "v1beta1",
4
- "metadata": {
5
- "selfLink": "/osapi/v1beta1/projects"
2
+ "kind": "ProjectList",
3
+ "apiVersion": "v1",
4
+ "metadata": {
5
+ "selfLink": "/oapi/v1/projects"
6
+ },
7
+ "items": [
8
+ {
9
+ "metadata": {
10
+ "name": "default",
11
+ "selfLink": "/oapi/v1/projects/default",
12
+ "uid": "caf47e12-248f-11e5-9fe4-727174f8ab71",
13
+ "resourceVersion": "4664",
14
+ "creationTimestamp": "2015-07-07T10:06:10Z",
15
+ "annotations": {
16
+ "openshift.io/sa.initialized-roles": "true",
17
+ "openshift.io/sa.scc.mcs": "s0:c1,c0",
18
+ "openshift.io/sa.scc.uid-range": "1000000000/10000"
19
+ }
20
+ },
21
+ "spec": {
22
+ "finalizers": [
23
+ "kubernetes",
24
+ "openshift.io/origin"
25
+ ]
26
+ },
27
+ "status": {
28
+ "phase": "Active"
29
+ }
30
+ },
31
+ {
32
+ "metadata": {
33
+ "name": "openshift",
34
+ "selfLink": "/oapi/v1/projects/openshift",
35
+ "uid": "cca1382e-248f-11e5-9fe4-727174f8ab71",
36
+ "resourceVersion": "92",
37
+ "creationTimestamp": "2015-07-07T10:06:13Z",
38
+ "annotations": {
39
+ "openshift.io/sa.scc.mcs": "s0:c3,c2",
40
+ "openshift.io/sa.scc.uid-range": "1000010000/10000"
41
+ }
42
+ },
43
+ "spec": {
44
+ "finalizers": [
45
+ "kubernetes",
46
+ "openshift.io/origin"
47
+ ]
48
+ },
49
+ "status": {
50
+ "phase": "Active"
51
+ }
52
+ },
53
+ {
54
+ "metadata": {
55
+ "name": "openshift-infra",
56
+ "selfLink": "/oapi/v1/projects/openshift-infra",
57
+ "uid": "cc65e05c-248f-11e5-9fe4-727174f8ab71",
58
+ "resourceVersion": "116",
59
+ "creationTimestamp": "2015-07-07T10:06:13Z",
60
+ "annotations": {
61
+ "openshift.io/sa.scc.mcs": "s0:c5,c0",
62
+ "openshift.io/sa.scc.uid-range": "1000020000/10000"
63
+ }
64
+ },
65
+ "spec": {
66
+ "finalizers": [
67
+ "kubernetes",
68
+ "openshift.io/origin"
69
+ ]
70
+ },
71
+ "status": {
72
+ "phase": "Active"
73
+ }
74
+ },
75
+ {
76
+ "metadata": {
77
+ "name": "test",
78
+ "selfLink": "/oapi/v1/projects/test",
79
+ "uid": "2626e632-2491-11e5-9fe4-727174f8ab71",
80
+ "resourceVersion": "241",
81
+ "creationTimestamp": "2015-07-07T10:15:53Z",
82
+ "annotations": {
83
+ "openshift.io/description": "",
84
+ "openshift.io/display-name": "",
85
+ "openshift.io/sa.scc.mcs": "s0:c6,c0",
86
+ "openshift.io/sa.scc.uid-range": "1000030000/10000"
87
+ }
88
+ },
89
+ "spec": {
90
+ "finalizers": [
91
+ "openshift.io/origin",
92
+ "kubernetes"
93
+ ]
94
+ },
95
+ "status": {
96
+ "phase": "Active"
97
+ }
6
98
  },
7
- "items": [
8
- {
9
- "metadata": {
10
- "name": "default",
11
- "selfLink": "/osapi/v1beta1/projects/default",
12
- "uid": "80115ecd-d874-11e4-b110-f8b156af4ae1",
13
- "resourceVersion": "3",
14
- "creationTimestamp": "2015-04-01T13:39:20Z"
15
- },
16
- "spec": {},
17
- "status": {
18
- "phase": "Active"
19
- }
20
- },
21
- {
22
- "metadata": {
23
- "name": "master",
24
- "selfLink": "/osapi/v1beta1/projects/master",
25
- "uid": "80359e00-d874-11e4-b110-f8b156af4ae1",
26
- "resourceVersion": "36",
27
- "creationTimestamp": "2015-04-01T13:39:20Z"
28
- },
29
- "spec": {},
30
- "status": {
31
- "phase": "Active"
32
- }
99
+ {
100
+ "metadata": {
101
+ "name": "test1",
102
+ "selfLink": "/oapi/v1/projects/test1",
103
+ "uid": "0ea8f61e-2492-11e5-9fe4-727174f8ab71",
104
+ "resourceVersion": "318",
105
+ "creationTimestamp": "2015-07-07T10:22:23Z",
106
+ "annotations": {
107
+ "openshift.io/description": "",
108
+ "openshift.io/display-name": "",
109
+ "openshift.io/sa.scc.mcs": "s0:c6,c5",
110
+ "openshift.io/sa.scc.uid-range": "1000040000/10000"
33
111
  }
34
- ]
112
+ },
113
+ "spec": {
114
+ "finalizers": [
115
+ "openshift.io/origin",
116
+ "kubernetes"
117
+ ]
118
+ },
119
+ "status": {
120
+ "phase": "Active"
121
+ }
122
+ }
123
+ ]
35
124
  }
data/test/json/route_b1.json CHANGED
@@ -1,20 +1,32 @@
1
1
  {
2
- "kind": "Route",
3
- "apiVersion": "v1beta1",
4
- "metadata": {
5
- "name": "route-edge",
6
- "namespace": "default",
7
- "selfLink": "/osapi/v1beta1/routes/route-edge?namespace=default",
8
- "uid": "99135218-d927-11e4-9471-f8b156af4ae1",
9
- "resourceVersion": "45156",
10
- "creationTimestamp": "2015-04-02T11:01:22Z"
2
+ "kind": "Route",
3
+ "apiVersion": "v1",
4
+ "metadata": {
5
+ "name": "route-edge",
6
+ "namespace": "test1",
7
+ "selfLink": "/oapi/v1/namespaces/test1/routes/route-edge",
8
+ "uid": "6937497c-249d-11e5-9fe4-727174f8ab71",
9
+ "resourceVersion": "886",
10
+ "creationTimestamp": "2015-07-07T11:43:39Z",
11
+ "labels": {
12
+ "template": "application-template-stibuild"
11
13
  },
14
+ "annotations": {
15
+ "openshift.io/host.generated": "false"
16
+ }
17
+ },
18
+ "spec": {
12
19
  "host": "www.example.com",
13
- "serviceName": "frontend",
20
+ "to": {
21
+ "kind": "Service",
22
+ "name": "frontend"
23
+ },
14
24
  "tls": {
15
- "termination": "edge",
16
- "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",
17
- "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",
18
- "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"
25
+ "termination": "edge",
26
+ "certificate": "-----BEGIN CERTIFICATE-----\nMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBoTELMAkGA1UEBhMCVVMx\nCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0Rl\nZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0ExGjAYBgNVBAMMEXd3\ndy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFtcGxlQGV4YW1wbGUu\nY29tMB4XDTE1MDExMjE0MTk0MVoXDTE2MDExMjE0MTk0MVowfDEYMBYGA1UEAwwP\nd3d3LmV4YW1wbGUuY29tMQswCQYDVQQIDAJTQzELMAkGA1UEBhMCVVMxIjAgBgkq\nhkiG9w0BCQEWE2V4YW1wbGVAZXhhbXBsZS5jb20xEDAOBgNVBAoMB0V4YW1wbGUx\nEDAOBgNVBAsMB0V4YW1wbGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMrv\ngu6ZTTefNN7jjiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm\n47VRx5Qrf/YLXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1M\nmNrQUgZyQC6XIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAGjDTALMAkGA1UdEwQC\nMAAwDQYJKoZIhvcNAQEFBQADggEBAFCi7ZlkMnESvzlZCvv82Pq6S46AAOTPXdFd\nTMvrh12E1sdVALF1P1oYFJzG1EiZ5ezOx88fEDTW+Lxb9anw5/KJzwtWcfsupf1m\nV7J0D3qKzw5C1wjzYHh9/Pz7B1D0KthQRATQCfNf8s6bbFLaw/dmiIUhHLtIH5Qc\nyfrejTZbOSP77z8NOWir+BWWgIDDB2//3AkDIQvT20vmkZRhkqSdT7et4NmXOX/j\njhPti4b2Fie0LeuvgaOdKjCpQQNrYthZHXeVlOLRhMTSk3qUczenkKTOhvP7IS9q\n+Dzv5hqgSfvMG392KWh5f8xXfJNs4W5KLbZyl901MeReiLrPH3w=\n-----END CERTIFICATE-----",
27
+ "key": "-----BEGIN PRIVATE KEY-----\nMIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMrvgu6ZTTefNN7j\njiZbS/xvQjyXjYMN7oVXv76jbX8gjMOmg9m0xoVZZFAE4XyQDuCm47VRx5Qrf/YL\nXmB2VtCFvB0AhXr5zSeWzPwaAPrjA4ebG+LUo24ziS8KqNxrFs1MmNrQUgZyQC6X\nIe1JHXc9t+JlL5UZyZQC1IfaJulDAgMBAAECgYEAnxOjEj/vrLNLMZE1Q9H7PZVF\nWdP/JQVNvQ7tCpZ3ZdjxHwkvf//aQnuxS5yX2Rnf37BS/TZu+TIkK4373CfHomSx\nUTAn2FsLmOJljupgGcoeLx5K5nu7B7rY5L1NHvdpxZ4YjeISrRtEPvRakllENU5y\ngJE8c2eQOx08ZSRE4TkCQQD7dws2/FldqwdjJucYijsJVuUdoTqxP8gWL6bB251q\nelP2/a6W2elqOcWId28560jG9ZS3cuKvnmu/4LG88vZFAkEAzphrH3673oTsHN+d\nuBd5uyrlnGjWjuiMKv2TPITZcWBjB8nJDSvLneHF59MYwejNNEof2tRjgFSdImFH\nmi995wJBAMtPjW6wiqRz0i41VuT9ZgwACJBzOdvzQJfHgSD9qgFb1CU/J/hpSRIM\nkYvrXK9MbvQFvG6x4VuyT1W8mpe1LK0CQAo8VPpffhFdRpF7psXLK/XQ/0VLkG3O\nKburipLyBg/u9ZkaL0Ley5zL5dFBjTV2Qkx367Ic2b0u9AYTCcgi2DsCQQD3zZ7B\nv7BOm7MkylKokY2MduFFXU0Bxg6pfZ7q3rvg8gqhUFbaMStPRYg6myiDiW/JfLhF\nTcFT4touIo7oriFJ\n-----END PRIVATE KEY-----",
28
+ "caCertificate": "-----BEGIN CERTIFICATE-----\nMIIEFzCCAv+gAwIBAgIJALK1iUpF2VQLMA0GCSqGSIb3DQEBBQUAMIGhMQswCQYD\nVQQGEwJVUzELMAkGA1UECAwCU0MxFTATBgNVBAcMDERlZmF1bHQgQ2l0eTEcMBoG\nA1UECgwTRGVmYXVsdCBDb21wYW55IEx0ZDEQMA4GA1UECwwHVGVzdCBDQTEaMBgG\nA1UEAwwRd3d3LmV4YW1wbGVjYS5jb20xIjAgBgkqhkiG9w0BCQEWE2V4YW1wbGVA\nZXhhbXBsZS5jb20wHhcNMTUwMTEyMTQxNTAxWhcNMjUwMTA5MTQxNTAxWjCBoTEL\nMAkGA1UEBhMCVVMxCzAJBgNVBAgMAlNDMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkx\nHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEDAOBgNVBAsMB1Rlc3QgQ0Ex\nGjAYBgNVBAMMEXd3dy5leGFtcGxlY2EuY29tMSIwIAYJKoZIhvcNAQkBFhNleGFt\ncGxlQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\nw2rK1J2NMtQj0KDug7g7HRKl5jbf0QMkMKyTU1fBtZ0cCzvsF4CqV11LK4BSVWaK\nrzkaXe99IVJnH8KdOlDl5Dh/+cJ3xdkClSyeUT4zgb6CCBqg78ePp+nN11JKuJlV\nIG1qdJpB1J5O/kCLsGcTf7RS74MtqMFo96446Zvt7YaBhWPz6gDaO/TUzfrNcGLA\nEfHVXkvVWqb3gqXUztZyVex/gtP9FXQ7gxTvJml7UkmT0VAFjtZnCqmFxpLZFZ15\n+qP9O7Q2MpsGUO/4vDAuYrKBeg1ZdPSi8gwqUP2qWsGd9MIWRv3thI2903BczDc7\nr8WaIbm37vYZAS9G56E4+wIDAQABo1AwTjAdBgNVHQ4EFgQUugLrSJshOBk5TSsU\nANs4+SmJUGwwHwYDVR0jBBgwFoAUugLrSJshOBk5TSsUANs4+SmJUGwwDAYDVR0T\nBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaMJ33zAMV4korHo5aPfayV3uHoYZ\n1ChzP3eSsF+FjoscpoNSKs91ZXZF6LquzoNezbfiihK4PYqgwVD2+O0/Ty7UjN4S\nqzFKVR4OS/6lCJ8YncxoFpTntbvjgojf1DEataKFUN196PAANc3yz8cWHF4uvjPv\nWkgFqbIjb+7D1YgglNyovXkRDlRZl0LD1OQ0ZWhd4Ge1qx8mmmanoBeYZ9+DgpFC\nj9tQAbS867yeOryNe7sEOIpXAAqK/DTu0hB6+ySsDfMo4piXCc2aA/eI2DCuw08e\nw17Dz9WnupZjVdwTKzDhFgJZMLDqn37HQnT6EemLFqbcR0VPEnfyhDtZIQ==\n-----END CERTIFICATE-----"
19
29
  }
30
+ },
31
+ "status": {}
20
32
  }
data/test/test_client.rb CHANGED
@@ -3,7 +3,7 @@ require 'test_helper'
3
3
  # Client general tests
4
4
  class TestClient < MiniTest::Test
5
5
  def test_api_valid
6
- client = OpenshiftClient::Client.new 'https://localhost:8080/osapi'
6
+ client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
7
7
  assert_equal(true, client.respond_to?('api_valid?'))
8
8
  end
9
9
  end
data/test/test_project.rb CHANGED
@@ -11,14 +11,14 @@ class TestProject < MiniTest::Test
11
11
  .to_return(body: open_test_json_file('project_b1.json'),
12
12
  status: 200)
13
13
 
14
- client = OpenshiftClient::Client.new 'https://localhost:8080/osapi'
15
- project = client.get_project 'master'
14
+ client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
15
+ project = client.get_project 'test'
16
16
 
17
17
  assert_instance_of(OpenshiftClient::Project, project)
18
- assert_equal('80359e00-d874-11e4-b110-f8b156af4ae1', project.metadata.uid)
19
- assert_equal('master', project.metadata.name)
20
- assert_equal('36', project.metadata.resourceVersion)
21
- assert_equal('v1beta1', project.apiVersion)
18
+ assert_equal('2626e632-2491-11e5-9fe4-727174f8ab71', project.metadata.uid)
19
+ assert_equal('test', project.metadata.name)
20
+ assert_equal('241', project.metadata.resourceVersion)
21
+ assert_equal('v1', project.apiVersion)
22
22
  end
23
23
 
24
24
  def test_get_projects
@@ -26,12 +26,12 @@ class TestProject < MiniTest::Test
26
26
  .to_return(body: open_test_json_file('project_list_b1.json'),
27
27
  status: 200)
28
28
 
29
- client = OpenshiftClient::Client.new 'https://localhost:8080/osapi'
29
+ client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
30
30
  projects = client.get_projects
31
31
 
32
32
  assert_instance_of(Kubeclient::Common::EntityList, projects)
33
33
 
34
- assert_equal(2, projects.size)
34
+ assert_equal(5, projects.size)
35
35
  assert_instance_of(OpenshiftClient::Project, projects[1])
36
36
  end
37
37
  end
data/test/test_route.rb CHANGED
@@ -11,12 +11,12 @@ class TestRoute < MiniTest::Test
11
11
  .to_return(body: open_test_json_file('route_b1.json'),
12
12
  status: 200)
13
13
 
14
- client = OpenshiftClient::Client.new 'https://localhost:8080/osapi'
15
- route = client.get_route 'master'
14
+ client = OpenshiftClient::Client.new 'https://localhost:8080/oapi'
15
+ route = client.get_route 'route-edge'
16
16
 
17
17
  assert_instance_of(OpenshiftClient::Route, route)
18
- assert_equal('99135218-d927-11e4-9471-f8b156af4ae1', route.metadata.uid)
18
+ assert_equal('6937497c-249d-11e5-9fe4-727174f8ab71', route.metadata.uid)
19
19
  assert_equal('route-edge', route.metadata.name)
20
- assert_equal('v1beta1', route.apiVersion)
20
+ assert_equal('v1', route.apiVersion)
21
21
  end
22
22
  end
metadata CHANGED
@@ -1,69 +1,69 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openshift_client
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.6
4
+ version: 0.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alissa Bonas
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-06-07 00:00:00.000000000 Z
11
+ date: 2015-07-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
19
  version: '1.7'
20
20
  type: :development
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
26
  version: '1.7'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: rake
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: '10.0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ~>
39
39
  - !ruby/object:Gem::Version
40
40
  version: '10.0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: minitest
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - '>='
46
46
  - !ruby/object:Gem::Version
47
47
  version: '0'
48
48
  type: :development
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - '>='
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: webmock
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ">="
59
+ - - '>='
60
60
  - !ruby/object:Gem::Version
61
61
  version: '0'
62
62
  type: :development
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ">="
66
+ - - '>='
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
84
84
  name: kubeclient
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ">="
87
+ - - '>='
88
88
  - !ruby/object:Gem::Version
89
89
  version: 0.1.17
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ">="
94
+ - - '>='
95
95
  - !ruby/object:Gem::Version
96
96
  version: 0.1.17
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: activesupport
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ">="
101
+ - - '>='
102
102
  - !ruby/object:Gem::Version
103
103
  version: '0'
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ">="
108
+ - - '>='
109
109
  - !ruby/object:Gem::Version
110
110
  version: '0'
111
111
  - !ruby/object:Gem::Dependency
@@ -129,9 +129,9 @@ executables: []
129
129
  extensions: []
130
130
  extra_rdoc_files: []
131
131
  files:
132
- - ".gitignore"
133
- - ".rubocop.yml"
134
- - ".travis.yml"
132
+ - .gitignore
133
+ - .rubocop.yml
134
+ - .travis.yml
135
135
  - Gemfile
136
136
  - LICENSE.txt
137
137
  - README.md
@@ -156,12 +156,12 @@ require_paths:
156
156
  - lib
157
157
  required_ruby_version: !ruby/object:Gem::Requirement
158
158
  requirements:
159
- - - ">="
159
+ - - '>='
160
160
  - !ruby/object:Gem::Version
161
161
  version: 2.0.0
162
162
  required_rubygems_version: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ">="
164
+ - - '>='
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  requirements: []