azure 0.6.0 → 0.6.1

data/test/integration/database/delete_sql_server_firewall_test.rb

@@ -1,72 +1,70 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed 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.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-
-describe Azure::SqlDatabaseManagementService do
-
-  let(:login_name) {'ms_open_tech'}
-  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
-   subject { Azure::SqlDatabaseManagementService.new }
-
-  before {
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-    Azure.config.management_endpoint = SqlServerEndpoint
-    subject.set_sql_server_firewall_rule(sql_server.name, "rule1")
-    ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
-    subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)
-  }
-
-  after {
-    Azure.config.management_endpoint = ManagementServiceEndpoint
-  }
-
-  describe "#delete_sql_server_firewall_rule" do
-
-    it "delete sql database server firewall" do
-      server_name = sql_server.name
-      subject.delete_sql_server_firewall_rule(server_name, 'rule1')
-
-      sql_server_firewalls = subject.list_sql_server_firewall_rules(server_name)
-      sql_server_firewalls.wont_be_nil
-      sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
-      sql_server_firewalls.size.must_equal 1
-      firewall = sql_server_firewalls.first
-      firewall[:rule].must_equal 'rule2'
-      firewall[:end_ip_address].must_equal "10.20.30.255"
-      firewall[:start_ip_address].must_equal "10.20.30.0"
-    end
-
-    it "errors if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.delete_sql_server_firewall_rule(server_name, 'rule1')
-      end
-      assert_match(/does not have server #{server_name}./i, exception.message)
-    end
-
-    it "errors if the sql server firewall rule does not exist" do
-      server_name = "unknown-server"
-      rule_name = 'rule10'
-      exception = assert_raises(RuntimeError) do
-        subject.delete_sql_server_firewall_rule(sql_server.name, rule_name)
-      end
-      assert_match(/The specified firewall rule #{rule_name} does not exist./i, exception.message)
-    end
-
-  end
-
-end
-
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# Licensed 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.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe Azure::SqlDatabaseManagementService do
+
+  let(:login_name) {'ms_open_tech'}
+  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
+  subject { Azure::SqlDatabaseManagementService.new }
+
+  before {
+    Loggerx.expects(:puts).returns(nil).at_least(0)
+    subject.set_sql_server_firewall_rule(sql_server.name, "rule1")
+    ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
+    subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)
+  }
+
+  after {
+    subject.delete_server(sql_server.name)
+  }
+
+  describe "#delete_sql_server_firewall_rule" do
+
+    it "delete sql database server firewall" do
+      server_name = sql_server.name
+      subject.delete_sql_server_firewall_rule(server_name, 'rule1')
+
+      sql_server_firewalls = subject.list_sql_server_firewall_rules(server_name)
+      sql_server_firewalls.wont_be_nil
+      sql_server_firewalls.must_be_kind_of Array
+      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.size.must_equal 1
+      firewall = sql_server_firewalls.first
+      firewall[:rule].must_equal 'rule2'
+      firewall[:end_ip_address].must_equal "10.20.30.255"
+      firewall[:start_ip_address].must_equal "10.20.30.0"
+    end
+
+    it "errors if the sql server does not exist" do
+      server_name = "unknown-server"
+      exception = assert_raises(Azure::Error::Error) do
+        subject.delete_sql_server_firewall_rule(server_name, 'rule1')
+      end
+      assert_match(/does not have server #{server_name}./i, exception.message)
+    end
+
+    it "errors if the sql server firewall rule does not exist" do
+      rule_name = 'rule10'
+      exception = assert_raises(RuntimeError) do
+        subject.delete_sql_server_firewall_rule(sql_server.name, rule_name)
+      end
+      assert_match(/The specified firewall rule #{rule_name} does not exist./i, exception.message)
+    end
+
+  end
+
+end
+

data/test/integration/database/delete_sql_server_test.rb

@@ -1,63 +1,58 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed 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.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-
-describe Azure::SqlDatabaseManagementService do
-
-  before {
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-    Azure.config.management_endpoint = SqlServerEndpoint
-  }
-
-  after {
-    Azure.config.management_endpoint = ManagementServiceEndpoint
-  }
-
-  subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
-
-  describe "#delete_sql_server" do
-
-    it "delete sql database server" do
-      server_name = sql_server.name
-      subject.delete_server(server_name)
-      sql_server = subject.list_servers.select{|x| x.name == server_name}.first
-      sql_server.must_be_nil
-    end
-
-    it "errors if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.delete_server(server_name)
-      end
-      assert_match(/does not have server #{server_name}./i, exception.message)
-    end
-
-    it "exception message should be valid" do
-      server_name = "unknown-server"
-      begin
-        subject.delete_server(server_name)
-      rescue Azure::Error::Error => error
-        error.status_code.must_equal 40647
-        error.type.must_equal "DatabaseServerNotFound"
-        error.description.end_with?("does not have server #{server_name}.").must_equal true
-      end
-    end
-
-  end
-
-end
-
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# Licensed 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.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe Azure::SqlDatabaseManagementService do
+
+  before {
+    Loggerx.expects(:puts).returns(nil).at_least(0)
+  }
+
+  subject { Azure::SqlDatabaseManagementService.new }
+  let(:login_name) {'ms_open_tech'}
+  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
+
+  describe "#delete_sql_server" do
+
+    it "delete sql database server" do
+      server_name = sql_server.name
+      subject.delete_server(server_name)
+      sql_server = subject.list_servers.select{|x| x.name == server_name}.first
+      sql_server.must_be_nil
+    end
+
+    it "errors if the sql server does not exist" do
+      server_name = "unknown-server"
+      exception = assert_raises(Azure::Error::Error) do
+        subject.delete_server(server_name)
+      end
+      assert_match(/does not have server #{server_name}./i, exception.message)
+    end
+
+    it "exception message should be valid" do
+      server_name = "unknown-server"
+      begin
+        subject.delete_server(server_name)
+      rescue Azure::Error::Error => error
+        error.status_code.must_equal 40647
+        error.type.must_equal "DatabaseServerNotFound"
+        error.description.end_with?("does not have server #{server_name}.").must_equal true
+      end
+    end
+
+  end
+
+end
+

data/test/integration/database/list_sql_server_firewall_test.rb

@@ -1,46 +1,45 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed 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.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-
-describe Azure::SqlDatabaseManagementService do
-
-  subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
-  describe "#list_sql_server_firewall_rules" do
-
-    before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
-      Azure.config.management_endpoint = SqlServerEndpoint
-      ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule1", ip_range)
-      subject.set_sql_server_firewall_rule(sql_server.name, "rule2")
-    }
-
-    after {
-      Azure.config.management_endpoint = ManagementServiceEndpoint
-    }
-
-    it "returns a list of SQL databse server firewall" do
-      sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
-      sql_server_firewalls.wont_be_nil
-      sql_server_firewalls.must_be_kind_of Array
-      sql_server_firewalls.first.must_be_kind_of Hash
-      sql_server_firewalls.size.must_equal 2
-    end
-
-  end
-
-end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# Licensed 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.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe Azure::SqlDatabaseManagementService do
+
+  subject { Azure::SqlDatabaseManagementService.new }
+  let(:login_name) {'ms_open_tech'}
+  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
+  describe "#list_sql_server_firewall_rules" do
+
+    before {
+      Loggerx.expects(:puts).returns(nil).at_least(0)
+      ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
+      subject.set_sql_server_firewall_rule(sql_server.name, "rule1", ip_range)
+      subject.set_sql_server_firewall_rule(sql_server.name, "rule2")
+    }
+
+    after {
+      subject.delete_server(sql_server.name)
+    }
+
+    it "returns a list of SQL databse server firewall" do
+      sql_server_firewalls = subject.list_sql_server_firewall_rules(sql_server.name)
+      sql_server_firewalls.wont_be_nil
+      sql_server_firewalls.must_be_kind_of Array
+      sql_server_firewalls.first.must_be_kind_of Hash
+      sql_server_firewalls.size.must_equal 2
+    end
+
+  end
+
+end

data/test/integration/database/list_sql_servers_test.rb

@@ -1,45 +1,44 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed 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.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-
-describe Azure::SqlDatabaseManagementService do
-
-  subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  describe "#list_servers" do
-
-    before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
-      Azure.config.management_endpoint = SqlServerEndpoint
-      subject.create_server(login_name, 'User1@123', WindowsImageLocation)
-      subject.create_server(login_name, 'User2@123', 'East US')
-    }
-
-    after {
-      Azure.config.management_endpoint = ManagementServiceEndpoint
-    }
-
-    it "returns a list of SQL databse servers" do
-      sql_servers = subject.list_servers
-      sql_servers.wont_be_nil
-      sql_servers.must_be_kind_of Array
-      sql_server = sql_servers.first
-      sql_server.must_be_kind_of Azure::SqlDatabaseManagement::SqlDatabase
-      assert_operator sql_servers.size, :>=, 2
-    end
-
-  end
-
-end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# Licensed 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.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe Azure::SqlDatabaseManagementService do
+
+  subject { Azure::SqlDatabaseManagementService.new }
+  let(:login_name) {'ms_open_tech'}
+  describe "#list_servers" do
+
+    before {
+      Loggerx.expects(:puts).returns(nil).at_least(0)
+    }
+
+    it "returns a list of SQL databse servers" do
+      server1 = subject.create_server(login_name, 'User1@123', WindowsImageLocation)
+      server2 = subject.create_server(login_name, 'User2@123', 'East US')
+
+      sql_servers = subject.list_servers
+      sql_servers.wont_be_nil
+      sql_servers.must_be_kind_of Array
+      sql_server = sql_servers.first
+      sql_server.must_be_kind_of Azure::SqlDatabaseManagement::SqlDatabase
+      assert_operator sql_servers.size, :>=, 2
+
+      subject.delete_server(server1.name)
+      subject.delete_server(server2.name)
+    end
+
+  end
+
+end

data/test/integration/database/reset_password_sql_server_test.rb

@@ -1,56 +1,55 @@
-#-------------------------------------------------------------------------
-# Copyright 2013 Microsoft Open Technologies, Inc.
-#
-# Licensed 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.
-#--------------------------------------------------------------------------
-require "integration/test_helper"
-
-describe Azure::SqlDatabaseManagementService do
-
-  subject { Azure::SqlDatabaseManagementService.new }
-  let(:login_name) {'ms_open_tech'}
-  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
-
-  describe "#reset_password" do
-
-    before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
-      Azure.config.management_endpoint = SqlServerEndpoint
-    }
-
-    after {
-      Azure.config.management_endpoint = ManagementServiceEndpoint
-    }
-
-    it "should be able to reset password of sql database server." do
-      subject.reset_password(sql_server.name, 'User2@123')
-    end
-
-    it "error if the sql server does not exist" do
-      server_name = "unknown-server"
-      exception = assert_raises(Azure::Error::Error) do
-        subject.reset_password(server_name, 'User2@123')
-      end
-      assert_match(/does not have server #{server_name}./i, exception.message)
-    end
-
-    it "error if the sql server password is invalid" do
-      password = "weak"
-      exception = assert_raises(RuntimeError) do
-        subject.reset_password(sql_server.name, password)
-      end
-      assert_match(/Password validation failed/i, exception.message)
-    end
-
-  end
-
-end
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# Licensed 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.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe Azure::SqlDatabaseManagementService do
+
+  subject { Azure::SqlDatabaseManagementService.new }
+  let(:login_name) {'ms_open_tech'}
+  let(:sql_server) { subject.create_server(login_name, 'User1@123', WindowsImageLocation) }
+
+  describe "#reset_password" do
+
+    before {
+      Loggerx.expects(:puts).returns(nil).at_least(0)
+    }
+
+    after {
+      subject.delete_server(sql_server.name)
+    }
+
+    it "should be able to reset password of sql database server." do
+      subject.reset_password(sql_server.name, 'User2@123')
+    end
+
+    it "error if the sql server does not exist" do
+      server_name = "unknown-server"
+      exception = assert_raises(Azure::Error::Error) do
+        subject.reset_password(server_name, 'User2@123')
+      end
+      assert_match(/does not have server #{server_name}./i, exception.message)
+    end
+
+    it "error if the sql server password is invalid" do
+      password = "weak"
+      exception = assert_raises(RuntimeError) do
+        subject.reset_password(sql_server.name, password)
+      end
+      assert_match(/Password validation failed/i, exception.message)
+    end
+
+  end
+
+end