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 2013/04/04 15:37:17 UTC
[1/2] git commit: CIMI - Tests - adding back testing for addresses
collection
Updated Branches:
refs/heads/master 4551f3ce9 -> 237a45560
CIMI - Tests - adding back testing for addresses collection
TrackedAt: http://tracker.deltacloud.org/patch/7715ed0a0c5fa0260befb598b3f3af693a745056
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/9be290d3
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/9be290d3
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/9be290d3
Branch: refs/heads/master
Commit: 9be290d34300d7669099387e00b033a07430380c
Parents: 4551f3c
Author: Ronelle Landy <rl...@redhat.com>
Authored: Mon Mar 18 16:37:27 2013 -0400
Committer: marios <ma...@redhat.com>
Committed: Thu Apr 4 16:36:55 2013 +0300
----------------------------------------------------------------------
tests/cimi/cep_test.rb | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/9be290d3/tests/cimi/cep_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/cep_test.rb b/tests/cimi/cep_test.rb
index c36ca16..f5b046f 100644
--- a/tests/cimi/cep_test.rb
+++ b/tests/cimi/cep_test.rb
@@ -26,9 +26,7 @@ class CloundEntryPointBehavior < CIMI::Test::Spec
"volumes", "volumeTemplates", "volumeConfigs", "volumeImages",
"networks", "networkTemplates", "networkConfigs", "networkPorts",
"networkPortTemplates", "networkPortConfigs",
-# FIXME: addresses exposes a Rabbit bug
-# "addresses",
- "addressTemplates", "forwardingGroups",
+ "addresses", "addressTemplates", "forwardingGroups",
"forwardingGroupTemplates",
"jobs", "meters", "meterTemplates", "meterConfigs",
"eventLogs", "eventLogTemplates" ]
[2/2] git commit: CIMI - Tests - adding test for Extended Machine
scenarios part 3 user_data
Posted by ma...@apache.org.
CIMI - Tests - adding test for Extended Machine scenarios part 3 user_data
TrackedAt: http://tracker.deltacloud.org/patch/69f615dadb83e3ab650fcd9746ddfff0f9265ac0
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/237a4556
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/237a4556
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/237a4556
Branch: refs/heads/master
Commit: 237a455606f887bdc43f4679a3e4d76efb23365e
Parents: 9be290d
Author: Ronelle Landy <rl...@redhat.com>
Authored: Thu Mar 28 11:52:20 2013 -0400
Committer: marios <ma...@redhat.com>
Committed: Thu Apr 4 16:36:56 2013 +0300
----------------------------------------------------------------------
tests/cimi/machex3_test.rb | 98 +++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/237a4556/tests/cimi/machex3_test.rb
----------------------------------------------------------------------
diff --git a/tests/cimi/machex3_test.rb b/tests/cimi/machex3_test.rb
new file mode 100644
index 0000000..eb38408
--- /dev/null
+++ b/tests/cimi/machex3_test.rb
@@ -0,0 +1,98 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership. The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+$:.unshift File.join(File.dirname(__FILE__))
+
+require "test_helper.rb"
+
+class AddUserDataToMachine < CIMI::Test::Spec
+ RESOURCE_URI =
+ "http://schemas.dmtf.org/cimi/1/Machine"
+ ROOTS = ["machines", "machineImages", "machineConfigurations"]
+ #USER_DATA_CAPABILITY_URI = "http://schemas.dmtf.org/cimi/1/capability/Machine/userData"
+
+ # Check the Machine Resource metadata to confirm if user_data is supported
+ #need_rmd(RESOURCE_URI, "capabilities", USER_DATA_CAPABILITY_URI)
+
+ MiniTest::Unit.after_tests { teardown(@@created_resources, api.basic_auth) }
+
+ # Ensure test executes in test plan order
+ i_suck_and_my_tests_are_order_dependent!
+
+ # 1: Query the CEP
+ model :subject, :cache => true do |fmt|
+ cep(:accept => fmt)
+ end
+
+ # CEP.machines, CEP.machineConfigs and CEP.machineImages must be set
+ query_the_cep(ROOTS)
+
+ # 2: Create a new machine with user_data
+ cep_json = cep(:accept => :json)
+ # Discover machine create URI:
+ machine_add_uri = discover_uri_for("add", "machines")
+ machine_created = post(machine_add_uri,
+ "<MachineCreate>" +
+ "<name>cimi_machine_machex3</name>" +
+ "<description> created as part of tests/cimi/machex3_test </description>" +
+ "<machineTemplate>" +
+ "<machineConfig " +
+ "href=\"" + get_a(cep_json, "machineConfig") + "\"/>" +
+ "<machineImage " +
+ "href=\"" + get_a(cep_json, "machineImage") + "\"/>" +
+ "<userData>QmFzZS02NCBlbmNvZGVkIGRhdGE=</userData>" +
+ "</machineTemplate>" +
+ "</MachineCreate>",
+ :accept => :json, :content_type => :xml)
+
+ model :machine do |fmt|
+ get machine_created.json["id"], :accept => fmt
+ end
+
+ it "should add resource for cleanup", :only => :json do
+ @@created_resources[:machines] << machine_created.json["id"]
+ end
+
+ it "should have 201 or 202 return code" do
+ machine_created.code.must_be_one_of [201, 202]
+ end
+
+ # 3. Find the address for the machine
+ it "should return an ip address" do
+ s = Set.new ["STOPPED", "STARTED"]
+ machine = get(machine_created.json["id"], :accept=>:json)
+ 5.times do |j|
+ break if s.include?(machine.json["state"].upcase)
+ puts machine.json["state"]
+ puts 'waiting for machine to be in a stable initial state'
+ sleep(5)
+ machine = get(machine_created.json["id"], :accept=>:json)
+ end unless s.include?(machine.json["state"].upcase)
+
+ # If the machine is created in the STOPPED state, start it
+ if machine.json["state"].upcase.eql?("STOPPED")
+ machine_stop_start(machine(:refetch => true), "start", "STARTED")
+ end
+
+ # Poll for the ip address
+ end
+
+ # Optional - Check that the user_data is available from the machine
+ it "should have user_data on the machine" do
+ # ssh to the machine
+ end
+
+ end