Skip to content

Commit 75ea3c1

Browse files
committed
Merge pull request #199 from fogbow/develop
Implementing tests. TestHTTPDownloadImageStorage, TestNoCloudIdentitylugin, TestAllowAllAuthorizationPugin.
2 parents 8526706 + 0f3bb68 commit 75ea3c1

File tree

107 files changed

+13408
-432
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+13408
-432
lines changed
-85.2 KB
Binary file not shown.
-54.9 KB
Binary file not shown.

bin/fogbow-create-reverse-tunnel

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,19 @@ if [ -n "$IS_OPENSSH" ] || [ -n "$IS_NEW_OPENSSH" ]; then
88
elif [ -n "$IS_DROPBEAR" ]; then
99
SSH_OPTIONS="-y -K 30"
1010
fi
11-
REMOTE_PORT=$(curl -X POST #TOKEN_HOST#:#TOKEN_HOST_HTTP_PORT#/token/#TOKEN_ID#)
1211
cat > /bin/fogbow-autossh << EOL
1312
#!/bin/sh
1413
autossh() {
1514
while true; do
16-
echo "Starting tunnel in port $REMOTE_PORT"
17-
echo "Command: ssh $SSH_OPTIONS -N -R 0.0.0.0:$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#"
18-
ssh $SSH_OPTIONS -N -R 0.0.0.0:$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#
15+
REMOTE_PORT="\$(curl -X POST #TOKEN_HOST#:#TOKEN_HOST_HTTP_PORT#/token/#TOKEN_ID#)"
16+
if [ -z "\$REMOTE_PORT" ]; then
17+
echo "No remote port available for #TOKEN_ID#, will try again in 30 seconds"
18+
sleep 30
19+
continue
20+
fi
21+
echo "Starting tunnel in port \$REMOTE_PORT"
22+
echo "Command: ssh $SSH_OPTIONS -N -R 0.0.0.0:\$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#"
23+
ssh $SSH_OPTIONS -N -R 0.0.0.0:\$REMOTE_PORT:localhost:22 #TOKEN_ID#@#TOKEN_HOST# -p #TOKEN_HOST_SSH_PORT#
1924
sleep 5
2025
done
2126
}

manager.conf.example

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ compute_novav2_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
2222
# compute_class=org.fogbowcloud.manager.core.plugins.compute.opennebula.OpenNebulaComputePlugin
2323
# compute_one_url=http://localhost:2633/RPC2
2424
# compute_one_network_id=1
25+
# compute_one_network_contextualization=false
2526
# compute_one_templates=all
2627
# compute_one_datastore_id=1
2728
# compute_one_ssh_host=127.0.0.1
@@ -49,6 +50,32 @@ compute_novav2_network_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
4950
# compute_occi_flavors_medium={cpu=2,mem=1024}
5051
# compute_occi_flavors_large={cpu=4,mem=2048}
5152

53+
## Compute Plugin (Cloudstack)
54+
# compute_class=org.fogbowcloud.manager.core.plugins.compute.cloudstack.CloudStackComputePlugin
55+
# compute_cloudstack_api_url=http://127.0.0.1:8080/client/api
56+
# compute_cloudstack_zone_id=d05bfc3e-85e5-4be8-9ae9-cc7c2deb95f1
57+
# compute_cloudstack_image_download_base_url=http://127.0.0.1/downloads/
58+
# compute_cloudstack_image_download_base_path=/var/www/downloads/
59+
# compute_cloudstack_hypervisor=KVM
60+
# compute_cloudstack_image_download_os_type_id=ea51ed0c-0e8a-448d-8202-c79777109ffe
61+
62+
##Compute Plugin (Azure)
63+
# compute_class=org.fogbowcloud.manager.core.plugins.compute.cloudstack.AzureComputePlugin
64+
# compute_azure_max_vcpu=10
65+
# compute_azure_max_ram=10240
66+
# compute_azure_region=East US
67+
# compute_azure_storage_account_name=storage1
68+
# compute_azure_storage_key=abcd12345
69+
70+
## Compute Plugin (EC2)
71+
# compute_ec2_region=us-east-1
72+
# compute_ec2_security_group_id=sg-12345678
73+
# compute_ec2_subnet_id=subnet-12345678
74+
# compute_ec2_image_bucket_name=s3-bucket-for-images
75+
# compute_ec2_max_vcpu=10
76+
# compute_ec2_max_ram=10240
77+
# compute_ec2_max_instances=10
78+
5279
## Image Storage Plugin (HTTPDownload)
5380
image_storage_class=org.fogbowcloud.manager.core.plugins.imagestorage.http.HTTPDownloadImageStoragePlugin
5481
image_storage_http_base_url=http://appliance-repo.egi.eu/images
@@ -90,6 +117,13 @@ nof_prioritize_local=true
90117
## If you are using NoFMemberPicker or NoFPrioritizationPlugin classes
91118
nof_trustworthy=false
92119

120+
## Local identity (CloudStack Identity Plugin)
121+
local_identity_class=org.fogbowcloud.manager.core.plugins.identity.cloudstack.cloudStackIdentityPlugin
122+
local_identity_url=http://localhost:8080/client/api
123+
local_proxy_account_user_name=fogbow
124+
local_proxy_account_password=fogbow
125+
local_proxy_account_domain=root
126+
93127
## Local identity (Keystone Identity Plugin)
94128
local_identity_class=org.fogbowcloud.manager.core.plugins.identity.openstack.KeystoneIdentityPlugin
95129
local_identity_url=http://localhost:5000
@@ -102,10 +136,20 @@ local_proxy_account_tenant_name=demo
102136
# x509_ca_dir_path=/path/to/ca/directory
103137

104138
## Local Identity (Opennebula Identity Plugin)
105-
# local_identity_class=org.fogbowcloud.manager.core.plugins.opennebula.OpenNebulaIdentityPlugin
139+
# local_identity_class=org.fogbowcloud.manager.core.plugins.identity.opennebula.OpenNebulaIdentityPlugin
106140
# local_identity_url=http://localhost:2633/RPC2
107141

108-
## Authorizatio Plugin
142+
## Local Identity (Cloudstack Identity Plugin)
143+
# local_identity_class=org.fogbowcloud.manager.core.plugins.identity.cloudstack.CloudStackIdentityPlugin
144+
# local_identity_url=http://127.0.0.1:8080/client/api/
145+
# local_proxy_account_api_key=user_api_key
146+
# local_proxy_account_secret_key=user_secret_key
147+
148+
## Local Identity (EC2)
149+
# local_proxy_account_ec2_access_key=AKIALSKQLKFD7AHQLKEUO
150+
# local_proxy_account_ec2_secret_key=Iuaooiad&891/2309asd0123+akplkdh
151+
152+
## Authorization Plugin
109153
federation_authorization_class=org.fogbowcloud.manager.core.plugins.authorization.AllowAllAuthorizationPlugin
110154

111155
## Federation identity (Keystone Identity Plugin)
@@ -122,6 +166,12 @@ federation_identity_url=http://localhost:5000
122166
# path_trust_anchors=/etc/grid-security/certificates
123167
# path_vomsdir=/etc/grid-security/vomsdir
124168

169+
## Identity (Azure)
170+
# federation_identity_class=org.fogbowcloud.manager.core.plugins.identity.azure.AzureIdentityPlugin
171+
# proxy_account_subscription_id=subscription_id
172+
# proxy_account_keystore_path=/etc/keystore/azure
173+
# proxy_account_keystore_password=test123
174+
125175
## Member Validator
126176
member_validator_class=org.fogbowcloud.manager.core.plugins.memberauthorization.DefaultMemberAuthorizationPlugin
127177
member_validator_ca_dir=

0 commit comments

Comments
 (0)