Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[EUWE] Upgrade azure-armrest gem to 0.5.2. #13670

Merged
merged 1 commit into from
Feb 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gems/pending/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ gem "activerecord", "~> 5.0.0" # used by appliance_console
gem "activesupport", "~> 5.0.0"
gem "addressable", "~> 2.4", :require => false
gem "awesome_spawn", "~> 1.4", :require => false
gem "azure-armrest", "=0.3.9", :require => false
gem "azure-armrest", "=0.5.2", :require => false
gem "bcrypt", "~> 3.1.10", :require => false
gem "binary_struct", "~> 2.1", :require => false
gem "bundler", ">= 1.8.4" # rails-assets requires bundler >= 1.8.4, see: https://rails-assets.org/
Expand Down

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@

@resource_group = 'miq-azure-test1'
@device_name = 'miq-test-rhel1' # Make sure this is running if generating a new cassette.
@ip_address = '40.117.184.27' # This will change if you had to restart the @device_name.
@mismatch_ip = '40.117.189.73' # This will change if you had to restart the 'miqmismatch' VM.
@ip_address = '13.90.136.193' # This will change if you had to restart the @device_name.
@mismatch_ip = '13.90.141.128' # This will change if you had to restart the 'miqmismatch' VM.
@template = nil
@avail_zone = nil

Expand Down Expand Up @@ -56,7 +56,7 @@ def setup_ems_and_cassette
it "will perform a full refresh with a plain proxy enabled" do
allow(VMDB::Util).to receive(:http_proxy_uri).and_return(proxy)
setup_ems_and_cassette
expect(OrchestrationTemplate.count).to eql(3)
expect(OrchestrationTemplate.count).to eql(4)
assert_specific_orchestration_template
end
end
Expand All @@ -68,7 +68,7 @@ def setup_ems_and_cassette

allow(VMDB::Util).to receive(:http_proxy_uri).and_return(proxy)
setup_ems_and_cassette
expect(OrchestrationTemplate.count).to eql(3)
expect(OrchestrationTemplate.count).to eql(4)
assert_specific_orchestration_template
end
end
Expand Down Expand Up @@ -100,7 +100,7 @@ def setup_ems_and_cassette
def expected_table_counts
{
:ext_management_system => 2,
:flavor => 63,
:flavor => 83,
:availability_zone => 1,
:vm_or_template => 12,
:vm => 11,
Expand All @@ -112,12 +112,12 @@ def expected_table_counts
:operating_system => 11,
:relationship => 0,
:miq_queue => 13,
:orchestration_template => 3,
:orchestration_stack => 17,
:orchestration_stack_parameter => 186,
:orchestration_template => 4,
:orchestration_stack => 20,
:orchestration_stack_parameter => 196,
:orchestration_stack_output => 9,
:orchestration_stack_resource => 76,
:security_group => 10,
:orchestration_stack_resource => 79,
:security_group => 11,
:network_port => 11,
:cloud_network => 6,
:floating_ip => 13,
Expand Down Expand Up @@ -175,14 +175,14 @@ def assert_ems
expect(@ems.miq_templates.size).to eq(expected_table_counts[:miq_template])

expect(@ems.orchestration_stacks.size).to eql(expected_table_counts[:orchestration_stack])
expect(@ems.direct_orchestration_stacks.size).to eql(16)
expect(@ems.direct_orchestration_stacks.size).to eql(19)
end

def assert_specific_load_balancers
lb_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/"\
lb_ems_ref = "/subscriptions/#{@subscription_id}/"\
"resourceGroups/miq-azure-test1/providers/Microsoft.Network/loadBalancers/rspec-lb1"

lb_pool_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/"\
lb_pool_ems_ref = "/subscriptions/#{@subscription_id}/"\
"resourceGroups/miq-azure-test1/providers/Microsoft.Network/loadBalancers/"\
"rspec-lb1/backendAddressPools/rspec-lb-pool"

Expand Down Expand Up @@ -211,15 +211,15 @@ def assert_specific_load_balancers
end

def assert_specific_load_balancer_listeners
lb_listener_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/resourceGroups/"\
lb_listener_ems_ref = "/subscriptions/#{@subscription_id}/resourceGroups/"\
"miq-azure-test1/providers/Microsoft.Network/loadBalancers/rspec-lb1/"\
"loadBalancingRules/rspec-lb1-rule"

lb_pool_member_1_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/resourceGroups/"\
lb_pool_member_1_ems_ref = "/subscriptions/#{@subscription_id}/resourceGroups/"\
"miq-azure-test1/providers/Microsoft.Network/networkInterfaces/rspec-lb-a670/"\
"ipConfigurations/ipconfig1"

lb_pool_member_2_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/resourceGroups/"\
lb_pool_member_2_ems_ref = "/subscriptions/#{@subscription_id}/resourceGroups/"\
"miq-azure-test1/providers/Microsoft.Network/networkInterfaces/rspec-lb-b843/"\
"ipConfigurations/ipconfig1"

Expand Down Expand Up @@ -248,7 +248,7 @@ def assert_specific_load_balancer_listeners
end

def assert_specific_load_balancer_health_checks
health_check_ems_ref = "/subscriptions/AZURE_SUBSCRIPTION_ID/resourceGroups/"\
health_check_ems_ref = "/subscriptions/#{@subscription_id}/resourceGroups/"\
"miq-azure-test1/providers/Microsoft.Network/loadBalancers/rspec-lb1/"\
"probes/rspec-lb-probe"

Expand Down
Loading