Skip to content
This repository was archived by the owner on Aug 29, 2018. It is now read-only.

Commit 6e65402

Browse files
author
Abhishek Gupta
committed
Merge pull request #6219 from abhgupta/abhgupta-dev
Removing oo-broker prefixes for admin commands
2 parents 5e20ed8 + 6f55c86 commit 6e65402

16 files changed

Lines changed: 31 additions & 47 deletions

‎broker/bin/oo-broker‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎broker/doc/bin/generate-rest-docs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def set_up
5959
request = RestClient::Request.new(:method => :get, :url => "https://#{options[:server]}/broker/rest/user", :user => "team.member@mycompany.com", :password => @password, :headers => @headers, :timeout => @timeout, :open_timeout => @timeout)
6060
response = send_request(request)
6161
#add private cert capability and additional storage capability
62-
system("oo-broker oo-admin-ctl-user -l #{@user} --allowprivatesslcertificates true --setmaxtrackedstorage 20 --setmaxteams 10 --allowha true --allowviewglobalteams true") if options[:server]=="localhost"
63-
system("oo-broker oo-admin-ctl-team -c create --name engineering-team --maps-to cn=engineering-team,ou=Groups,dc=example,dc=com")
62+
system("oo-admin-ctl-user -l #{@user} --allowprivatesslcertificates true --setmaxtrackedstorage 20 --setmaxteams 10 --allowha true --allowviewglobalteams true") if options[:server]=="localhost"
63+
system("oo-admin-ctl-team -c create --name engineering-team --maps-to cn=engineering-team,ou=Groups,dc=example,dc=com")
6464

6565
if options[:version]
6666
@headers = {:accept => "application/json; version=#{@version}"}
@@ -229,9 +229,9 @@ def process_resource(request, resource)
229229
end
230230

231231
def tear_down
232-
system("oo-broker oo-admin-ctl-app -l #{@user} -c force-destroy -b -a myapp")
233-
system("oo-broker oo-admin-ctl-domain -l #{@user} -c delete -n mydomain")
234-
system("oo-broker oo-admin-ctl-domain -l #{@user} -c delete")
232+
system("oo-admin-ctl-app -l #{@user} -c force-destroy -b -a myapp")
233+
system("oo-admin-ctl-domain -l #{@user} -c delete -n mydomain")
234+
system("oo-admin-ctl-domain -l #{@user} -c delete")
235235
end
236236

237237
if __FILE__ == $0

‎broker/openshift-origin-broker.spec‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@ cp conf/broker.conf %{buildroot}%{_sysconfdir}/openshift/broker-dev.conf
165165
cp conf/quickstarts.json %{buildroot}%{_sysconfdir}/openshift/quickstarts.json
166166
cp conf/plugins.d/README %{buildroot}%{_sysconfdir}/openshift/plugins.d/README
167167

168-
mkdir -p %{buildroot}%{_sbindir}
169-
cp bin/oo-broker %{buildroot}%{_sbindir}/oo-broker
170-
171168
# BZ986300
172169
rm -f %{buildroot}%{brokerdir}/COPYRIGHT
173170
rm -f %{buildroot}%{brokerdir}/.gitignore
@@ -212,7 +209,6 @@ sed -i -e '/NON-RUNTIME BEGIN/,/NON-RUNTIME END/d' %{buildroot}%{brokerdir}/Gemf
212209
%attr(0750,-,-) %{brokerdir}/tmp/pids
213210
%attr(0750,-,-) %{brokerdir}/tmp/sessions
214211
%attr(0750,-,-) %{brokerdir}/tmp/sockets
215-
%attr(0750,root,root) %{_sbindir}/oo-broker
216212
%dir %attr(0750,-,-) %{brokerdir}/httpd/conf.d
217213
%{brokerdir}
218214
%{htmldir}/broker

‎broker/test/functional_ext/app_cartridges_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_app_cartridge_create
170170

171171
# set the max gear limit for the user to 3, if it isn't already so
172172
unless CloudUser.find_by(login: @login ).max_gears == 3
173-
system("oo-broker --non-interactive oo-admin-ctl-user -l #{@login} --setmaxgears 3")
173+
system("oo-admin-ctl-user -l #{@login} --setmaxgears 3")
174174
end
175175

176176
# embed mysql cartridge into the scalable app

‎broker/test/functional_ext/app_events_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ def test_app_scaling_events
244244
assert_response :created
245245

246246
#set gear limit
247-
system "oo-broker --non-interactive oo-admin-ctl-user -l #{@login} --setmaxgears 3"
247+
system "oo-admin-ctl-user -l #{@login} --setmaxgears 3"
248248

249249
# create non-scalable application
250250
request_via_redirect(:post, APP_COLLECTION_URL_FORMAT % [ns], {:name => "appnoscale", :cartridge => php_version}, @headers)

‎broker/test/functional_ext/application_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def test_app_limit_and_duplicate
135135
assert_equal 0, Domain.find_by(namespace: ns).owner.consumed_gears
136136

137137
#set gear limit
138-
system "oo-broker --non-interactive oo-admin-ctl-user -l #{@login} --setmaxgears 3"
138+
system "oo-admin-ctl-user -l #{@login} --setmaxgears 3"
139139

140140
# create application #1
141141
request_via_redirect(:post, APP_COLLECTION_URL_FORMAT % [ns], {:name => "app1", :cartridge => php_version}, @headers)

‎broker/test/functional_ext/oo_admin_ctl_user_test.rb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ def teardown
3333
end
3434

3535
def run_command(*args)
36-
result = `oo-broker --non-interactive env "RAILS_ENV=test" oo-admin-ctl-user #{args.join(' ')} 2>&1`
36+
result = `env "RAILS_ENV=test" oo-admin-ctl-user #{args.join(' ')} 2>&1`
3737
[result, $?.exitstatus]
3838
end
3939

4040
def run_command_stderr(*args)
41-
result = `oo-broker --non-interactive env "RAILS_ENV=test" oo-admin-ctl-user #{args.join(' ')} 2>&1 > /dev/null`
41+
result = `env "RAILS_ENV=test" oo-admin-ctl-user #{args.join(' ')} 2>&1 > /dev/null`
4242
[result, $?.exitstatus]
4343
end
4444

‎broker/test/functional_ext/removed_nodes_app_fixup_test.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def test_unresponsive_apps
185185
end
186186

187187
def repair_apps(confirm=true)
188-
output = `oo-broker --non-interactive env "RAILS_ENV=test" oo-admin-repair --removed-nodes --verbose --confirm #{confirm} 2>&1`
188+
output = `env "RAILS_ENV=test" oo-admin-repair --removed-nodes --verbose --confirm #{confirm} 2>&1`
189189
exit_code = $?.exitstatus
190190
puts output if exit_code != 0
191191
end

‎controller/test/cucumber/acceptance-scripts.feature‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Feature: Acceptance scripts for sanity checking infrastructure
1313
@not-enterprise
1414
Scenarios: Acceptance script scenarios
1515
| script | output | exitcode |
16-
| oo-broker-attach /usr/sbin/oo-accept-systems | PASS | 0 |
16+
| /usr/sbin/oo-accept-systems | PASS | 0 |
1717

1818
@not-online
1919
Scenarios: Acceptance script scenarios

‎controller/test/cucumber/step_definitions/domain_member_steps.rb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
When /^the (?:user|member) "([^\"]*)" is added to the (?:domain|namespace) "([^\"]*)"$/ do |new_member, namespace|
1313
app_login = get_app_login_from_namespace(namespace)
14-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c add_member -m #{new_member}"
14+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c add_member -m #{new_member}"
1515
$logger.info("Executing the command: #{command}")
1616
output_buffer = []
1717
exit_code = run(command, output_buffer)
@@ -20,7 +20,7 @@
2020

2121
When /^the (?:user|member) "([^\"]*)" is removed from the (?:domain|namespace) "([^\"]*)"$/ do |removed_member, namespace|
2222
app_login = get_app_login_from_namespace(namespace)
23-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c remove_member -m #{removed_member}"
23+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c remove_member -m #{removed_member}"
2424
$logger.info("Executing the command: #{command}")
2525
output_buffer = []
2626
exit_code = run(command, output_buffer)
@@ -29,27 +29,27 @@
2929

3030
Then /^the (?:user|member) "([^\"]*)" is a member of the (?:domain|namespace) "([^\"]*)"$/ do |member, namespace|
3131
app_login = get_app_login_from_namespace(namespace)
32-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
32+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
3333
$logger.info("Executing the command: #{command}")
3434
output_buffer = []
3535
exit_code = run(command, output_buffer)
3636
raise "Failed to list members of namespace #{namespace}. Exit code: #{exit_code} and output message: #{output_buffer}" if exit_code != 0
37-
output_buffer[0].split("\n")[1].should == "#{app_login}(admin), #{member}(admin)\r"
37+
output_buffer[0].split("\n")[1].should == "#{app_login}(admin), #{member}(admin)"
3838
end
3939

4040
Then /^the (?:user|member) "([^\"]*)" is not a member of the (?:domain|namespace) "([^\"]*)"$/ do |member, namespace|
4141
app_login = get_app_login_from_namespace(namespace)
42-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
42+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
4343
$logger.info("Executing the command: #{command}")
4444
output_buffer = []
4545
exit_code = run(command, output_buffer)
4646
raise "Failed to list members of namespace #{namespace}. Exit code: #{exit_code} and output message: #{output_buffer}" if exit_code != 0
47-
output_buffer[0].split("\n")[1].should == "#{app_login}(admin)\r"
47+
output_buffer[0].split("\n")[1].should == "#{app_login}(admin)"
4848
end
4949

5050
When /^the "([^\"]*)" (?:user|member)'s role is modified to "([^\"]*)" in the namespace "([^\"]*)"$/ do |member, role, namespace|
5151
app_login = get_app_login_from_namespace(namespace)
52-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c update_member -m #{member} -r #{role}"
52+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c update_member -m #{member} -r #{role}"
5353
$logger.info("Executing the command: #{command}")
5454
output_buffer = []
5555
exit_code = run(command, output_buffer)
@@ -58,12 +58,12 @@
5858

5959
Then /^the (?:user|member) "([^\"]*)" has the role "([^\"]*)" in the (?:namespace|domain) "([^\"]*)"$/ do |member, role, namespace|
6060
app_login = get_app_login_from_namespace(namespace)
61-
command = "oo-broker --non-interactive oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
61+
command = "oo-admin-ctl-domain -l \"#{app_login}\" -n #{namespace} -c list_members"
6262
$logger.info("Executing the command: #{command}")
6363
output_buffer = []
6464
exit_code = run(command, output_buffer)
6565
raise "Failed to list members of namespace #{namespace}. Exit code: #{exit_code} and output message: #{output_buffer}" if exit_code != 0
66-
output_buffer[0].split("\n")[1].should == "#{app_login}(admin), #{member}(edit)\r"
66+
output_buffer[0].split("\n")[1].should == "#{app_login}(admin), #{member}(edit)"
6767
end
6868

6969
def get_app_login_from_namespace(namespace)

0 commit comments

Comments
 (0)