You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2012/03/16 14:42:53 UTC
[2/3] git commit: CIMI: adds network_templates and routing_groups to
deltacloud mock driver and mocking data (json)
CIMI: adds network_templates and routing_groups to deltacloud mock driver and mocking data (json)
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/d4f31069
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/d4f31069
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/d4f31069
Branch: refs/heads/master
Commit: d4f31069d073ab1aad47ad818eaade7244788e5a
Parents: f81c65b
Author: marios <ma...@redhat.com>
Authored: Fri Mar 16 15:41:06 2012 +0200
Committer: marios <ma...@redhat.com>
Committed: Fri Mar 16 15:41:06 2012 +0200
----------------------------------------------------------------------
.../drivers/mock/data/cimi/network/network1.json | 2 +-
.../drivers/mock/data/cimi/network/network2.json | 2 +-
.../network_configuration/network_config1.json | 2 +-
.../network_configuration/network_config2.json | 2 +-
.../mock/data/cimi/network_template/template1.json | 10 +++++
.../mock/data/cimi/network_template/template2.json | 10 +++++
.../mock/data/cimi/routing_group/group1.json | 13 ++++++
server/lib/deltacloud/drivers/mock/mock_driver.rb | 30 +--------------
8 files changed, 38 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network/network1.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network/network1.json b/server/lib/deltacloud/drivers/mock/data/cimi/network/network1.json
index 165ef8a..28cf767 100644
--- a/server/lib/deltacloud/drivers/mock/data/cimi/network/network1.json
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network/network1.json
@@ -1,4 +1,4 @@
-{ "uri": "http://cimi.example.org/networks/network1",
+{ "id": "http://cimi.example.org/networks/network1",
"name": "network1",
"description": "the first network",
"created": "Thu Jan 12 15:25:41 EET 2012",
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network/network2.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network/network2.json b/server/lib/deltacloud/drivers/mock/data/cimi/network/network2.json
index 3bd264e..370db99 100644
--- a/server/lib/deltacloud/drivers/mock/data/cimi/network/network2.json
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network/network2.json
@@ -1,4 +1,4 @@
-{ "uri": "http://cimi.example.org/networks/network2",
+{ "id": "http://cimi.example.org/networks/network2",
"name": "network2",
"description": "another network",
"created": "Fri Jan 13 17:30:34 EET 2012",
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config1.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config1.json b/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config1.json
index f767de9..8fad5d3 100644
--- a/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config1.json
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config1.json
@@ -1,4 +1,4 @@
-{ "uri": "http://cimi.example.org/network_configurations/network_config1",
+{ "id": "http://cimi.example.org/network_configurations/network_config1",
"name": "network_config1",
"description": "a network configuration",
"created": "Fri Mar 9 11:57:39 EET 2012",
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config2.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config2.json b/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config2.json
index b22d837..e489bf5 100644
--- a/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config2.json
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network_configuration/network_config2.json
@@ -1,4 +1,4 @@
-{ "uri": "http://cimi.example.org/network_configurations/network_config2",
+{ "id": "http://cimi.example.org/network_configurations/network_config2",
"name": "network_config2",
"description": "a network configuration",
"created": "Fri Mar 9 12:01:53 EET 2012",
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template1.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template1.json b/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template1.json
new file mode 100644
index 0000000..682d39b
--- /dev/null
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template1.json
@@ -0,0 +1,10 @@
+{ "id": "http://cimi.example.org/network_templates/template1",
+ "name": "template1",
+ "description": "A mock network template",
+ "created": "Thu Mar 15 12:15:15 EET 2012",
+ "networkConfig": {"href": "http://cimi.example.org/network_configurations/network_config1"},
+ "routingGroup": {"href": "http://cimi.example.org/routing_groups/group1"},
+ "operations": [
+ { "rel": "edit", "href": "http://cimi.example.org/network_templates/template1" },
+ { "rel": "delete", "href": "http://cimi.example.org/network_templates/template1" }]
+}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template2.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template2.json b/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template2.json
new file mode 100644
index 0000000..b7222cc
--- /dev/null
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/network_template/template2.json
@@ -0,0 +1,10 @@
+{ "id": "http://cimi.example.org/network_templates/template2",
+ "name": "template2",
+ "description": "Another mock network template",
+ "created": "Thu Mar 15 13:51:12 EET 2012",
+ "networkConfig": {"href": "http://cimi.example.org/network_configurations/network_config2"},
+ "routingGroup": {"href": "http://cimi.example.org/routing_groups/group1"},
+ "operations": [
+ { "rel": "edit", "href": "http://cimi.example.org/network_templates/template2" },
+ { "rel": "delete", "href": "http://cimi.example.org/network_templates/template2" }]
+}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/data/cimi/routing_group/group1.json
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/data/cimi/routing_group/group1.json b/server/lib/deltacloud/drivers/mock/data/cimi/routing_group/group1.json
new file mode 100644
index 0000000..e10e0bd
--- /dev/null
+++ b/server/lib/deltacloud/drivers/mock/data/cimi/routing_group/group1.json
@@ -0,0 +1,13 @@
+{ "id": "http://cimi.example.org/routing_groups/group1",
+ "name": "group1",
+ "description": "a mock routing group",
+ "created": "Thu Jan 12 16:02:56 EET 2012",
+ "networks": [
+ { "href": "http://cimi.example.org/networks/network1"},
+ { "href": "http://cimi.example.org/networks/network2"}
+ ],
+ "operations": [
+ { "rel": "edit", "href": "http://cimi.example.org/routing_groups/group1" },
+ { "rel": "delete", "href": "http://cimi.example.org/routing_groups/group1" }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/d4f31069/server/lib/deltacloud/drivers/mock/mock_driver.rb
----------------------------------------------------------------------
diff --git a/server/lib/deltacloud/drivers/mock/mock_driver.rb b/server/lib/deltacloud/drivers/mock/mock_driver.rb
index 1725538..67b4990 100644
--- a/server/lib/deltacloud/drivers/mock/mock_driver.rb
+++ b/server/lib/deltacloud/drivers/mock/mock_driver.rb
@@ -20,6 +20,7 @@ require 'base64'
require 'etc'
require 'deltacloud/base_driver'
require 'deltacloud/drivers/mock/mock_client'
+require 'deltacloud/drivers/mock/mock_driver_cimi_methods'
module Deltacloud::Drivers::Mock
@@ -453,28 +454,6 @@ module Deltacloud::Drivers::Mock
return false
end
- def networks(credentials, opts={})
- check_credentials(credentials)
- if opts[:id].nil?
- networks = @client.load_all_cimi(:network).map{|net| CIMI::Model::Network.from_json(net)}
- networks.map{|net|convert_cimi_mock_urls(:network, net ,opts[:env])}.flatten
- else
- network = CIMI::Model::Network.from_json(@client.load_cimi(:network, opts[:id]))
- convert_cimi_mock_urls(:network, network, opts[:env])
- end
- end
-
- def network_configurations(credentials, opts={})
- check_credentials(credentials)
- if opts[:id].nil?
- network_configs = @client.load_all_cimi(:network_configuration).map{|net_config| CIMI::Model::NetworkConfiguration.from_json(net_config)}
- network_configs.map{|net_config|convert_cimi_mock_urls(:network_configuration, net_config, opts[:env])}.flatten
- else
- network_config = CIMI::Model::NetworkConfiguration.from_json(@client.load_cimi(:network_configuration, opts[:id]))
- convert_cimi_mock_urls(:network_configuration, network_config, opts[:env])
- end
- end
-
private
def check_credentials(credentials)
@@ -511,13 +490,6 @@ module Deltacloud::Drivers::Mock
StorageVolume.new(volume)
end
- def convert_cimi_mock_urls(model_name, cimi_object, context)
- uri=context.send(:"#{model_name}_url", cimi_object.name)
- cimi_object.id=uri
- cimi_object.operations.each{|op| op.href=uri}
- cimi_object
- end
-
exceptions do
on /AuthFailure/ do