Merge pull request #234 from fogbow/develop

Merge pull request #233 from fogbow/discontinuingLocalToken

Author: giovannifs

manager.conf.example

@@ -6,6 +6,10 @@ xmpp_port=5347
 rendezvous_jid=rendezvous.test.com
 greensitter_jid=greensitter.test.com
 
+## Order database
+order_datastore_url=jdbc:h2:/home/chicog/Backup/dbmanager
+order_bd_updater_period=30000
+
 ## Static mapping from flavors to requirements (Optional)
 # flavor_fogbow_small={mem=512, cpu=1}
 # flavor_fogbow_medium={mem=1024, cpu=2}
@@ -117,19 +121,9 @@ nof_prioritize_local=true
 ## If you are using NoFMemberPicker or NoFPrioritizationPlugin classes
 nof_trustworthy=false
 
-## Local identity (CloudStack Identity Plugin)
-local_identity_class=org.fogbowcloud.manager.core.plugins.identity.cloudstack.cloudStackIdentityPlugin
-local_identity_url=http://localhost:8080/client/api
-local_proxy_account_user_name=fogbow
-local_proxy_account_password=fogbow
-local_proxy_account_domain=root
-
 ## Local identity (Keystone Identity Plugin)
 local_identity_class=org.fogbowcloud.manager.core.plugins.identity.openstack.KeystoneIdentityPlugin
 local_identity_url=http://localhost:5000
-local_proxy_account_user_name=fogbow
-local_proxy_account_password=fogbow
-local_proxy_account_tenant_name=demo
 
 ## Local Identity (X509 Identity Plugin)
 # local_identity_class=org.fogbowcloud.manager.core.plugins.x509.X509IdentityPlugin
@@ -142,12 +136,35 @@ local_proxy_account_tenant_name=demo
 ## Local Identity (Cloudstack Identity Plugin)
 # local_identity_class=org.fogbowcloud.manager.core.plugins.identity.cloudstack.CloudStackIdentityPlugin
 # local_identity_url=http://127.0.0.1:8080/client/api/
-# local_proxy_account_api_key=user_api_key
-# local_proxy_account_secret_key=user_secret_key
 
-## Local Identity (EC2)
-# local_proxy_account_ec2_access_key=AKIALSKQLKFD7AHQLKEUO
-# local_proxy_account_ec2_secret_key=Iuaooiad&891/2309asd0123+akplkdh
+## Local Credentials
+federation_user_credentail_class=org.fogbowcloud.manager.core.plugins.localcredentails.SingleLocalCrendentialsPlugin
+# federation_user_credentail_class=org.fogbowcloud.manager.core.plugins.localcredentails.MemberBasedLocalCrendetialsPlugin
+# federation_user_credentail_class=org.fogbowcloud.manager.core.plugins.localcredentails.VOBasedLocalCrendentialsPlugin
+
+## Mandatory for Local Credentails
+
+# Local credentials for openstack
+local_credential_defaults_username=fogbow
+local_credential_defaults_password=fogbow
+local_credential_defaults_tenantName=fogbow
+
+# Local credentials for opennebula
+# local_credential_defaults_username=fogbow
+# local_credential_defaults_password=fogbowpass
+
+## Local credentials for (EC2)
+# local_credential_defaults_accessKey=AKIALSKQLKFD7AHQLKEUO
+# local_credential_defaults_secretKey=Iuaooiad&891/2309asd0123+akplkdh
+
+## Local credentials for Cloudstack
+# local_credential_defaults_apiKey=user_api_key
+# local_credential_defaults_secret_key=user_secret_key
+
+## Optional for Local Credentails
+# local_credential_other_username=
+# local_credential_other_password=
+# local_credential_other_tenantName=
 
 ## Authorization Plugin
 federation_authorization_class=org.fogbowcloud.manager.core.plugins.authorization.AllowAllAuthorizationPlugin
@@ -168,9 +185,9 @@ federation_identity_url=http://localhost:5000
 
 ## Identity (Azure)
 # federation_identity_class=org.fogbowcloud.manager.core.plugins.identity.azure.AzureIdentityPlugin
-# proxy_account_subscription_id=subscription_id
-# proxy_account_keystore_path=/etc/keystore/azure
-# proxy_account_keystore_password=test123
+# local_credential_defaults_subscription_id=subscription_id
+# local_credential_defaults_keystore_path=/etc/keystore/azure
+# local_credential_defaults_keystore_password=test123
 
 ## Member Validator
 member_validator_class=org.fogbowcloud.manager.core.plugins.memberauthorization.DefaultMemberAuthorizationPlugin
@@ -198,3 +215,19 @@ ssh_public_key=/etc/fogbow-manager/ssh/id_rsa.pub
 
 ## Benchmarking (Vanilla Benchmarking Plugin)
 # benchmarking_class=org.fogbowcloud.manager.core.plugins.benchmarking.VanillaBenchmarkingPlugin
+
+
+## OCCI extra resources
+#occi_extra_resource_file_path=
+
+
+public_key; scheme="http://schemas.openstack.org/instance/credentials#"; class="mixin"; 
+org.openstack.credentials.publickey.data
+
+# Request public key properties
+occi_extra_resource_fogbow_public_key=public_key
+occi_extra_resource_org.fogbowcloud.credentials.publickey.data=org.openstack.credentials.publickey.data
+
+# Request userdata properties
+occi_extra_resource_fogbow_userdata=user_data
+occi_extra_resource_org.fogbowcloud.request.extra-user-data=org.openstack.compute.user_data

pom.xml

@@ -250,10 +250,16 @@
 	    <artifactId>azure-management</artifactId>
 	    <version>0.8.0</version>
 	</dependency>
-    <dependency>
+    	<dependency>
 		<groupId>org.opensaml</groupId>
 		<artifactId>opensaml</artifactId>
 		<version>2.6.4</version>
+            	<exclusions>
+        	    <exclusion>
+              		<groupId>org.bouncycastle</groupId>
+                   	<artifactId>bcprov-jdk15on</artifactId>
+                    </exclusion>
+            	</exclusions>
 	</dependency>
   </dependencies>
 

src/main/java/org/fogbowcloud/manager/Main.java

@@ -13,12 +13,14 @@
 import org.fogbowcloud.manager.core.plugins.ComputePlugin;
 import org.fogbowcloud.manager.core.plugins.FederationMemberAuthorizationPlugin;
 import org.fogbowcloud.manager.core.plugins.FederationMemberPickerPlugin;
+import org.fogbowcloud.manager.core.plugins.LocalCredentialsPlugin;
 import org.fogbowcloud.manager.core.plugins.IdentityPlugin;
 import org.fogbowcloud.manager.core.plugins.ImageStoragePlugin;
 import org.fogbowcloud.manager.core.plugins.PrioritizationPlugin;
 import org.fogbowcloud.manager.core.plugins.accounting.FCUAccountingPlugin;
 import org.fogbowcloud.manager.core.plugins.benchmarking.VanillaBenchmarkingPlugin;
 import org.fogbowcloud.manager.core.plugins.imagestorage.http.HTTPDownloadImageStoragePlugin;
+import org.fogbowcloud.manager.core.plugins.localcredentails.SingleLocalCrendentialsPlugin;
 import org.fogbowcloud.manager.core.plugins.memberauthorization.DefaultMemberAuthorizationPlugin;
 import org.fogbowcloud.manager.core.plugins.memberpicker.RoundRobinMemberPickerPlugin;
 import org.fogbowcloud.manager.core.plugins.prioritization.TwoFoldPrioritizationPlugin;
@@ -133,6 +135,25 @@ public static void main(String[] args) throws Exception {
 			LOGGER.warn("Member picker plugin not specified in properties. Using the default one.", e);
 		}
 
+		LocalCredentialsPlugin localCredentialsPlugin = null;
+		try {
+			localCredentialsPlugin = (LocalCredentialsPlugin) createInstance(
+					ConfigurationConstants.LOCAL_CREDENTIALS_CLASS_KEY, properties);
+		} catch (Exception e) {
+			localCredentialsPlugin = new SingleLocalCrendentialsPlugin(properties);
+			LOGGER.warn("Federation user crendetail plugin not specified in properties. Using the default one.", e);
+		}		
+		
+		String occiExtraResourcesPath = properties
+				.getProperty(ConfigurationConstants.OCCI_EXTRA_RESOURCES_KEY_PATH);
+		if (occiExtraResourcesPath != null && !occiExtraResourcesPath.isEmpty()) {
+			if (properties.getProperty(ConfigurationConstants.INSTANCE_DATA_STORE_URL) == null) {
+				LOGGER.error("If OCCI extra resources was set for supporting post-compute, you must also set instance datastore property ("
+						+ ConfigurationConstants.INSTANCE_DATA_STORE_URL + ").");
+				System.exit(EXIT_ERROR_CODE);
+			}
+		}
+		
 		PrioritizationPlugin prioritizationPlugin = new TwoFoldPrioritizationPlugin(properties,
 				accountingPlugin);
 
@@ -147,6 +168,7 @@ public static void main(String[] args) throws Exception {
 		facade.setAccountingPlugin(accountingPlugin);
 		facade.setMemberPickerPlugin(memberPickerPlugin);
 		facade.setPrioritizationPlugin(prioritizationPlugin);
+		facade.setFederationUserCredentailsPlugin(localCredentialsPlugin);
 
 		String xmppHost = properties.getProperty(ConfigurationConstants.XMPP_HOST_KEY);
 		String xmppJid = properties.getProperty(ConfigurationConstants.XMPP_JID_KEY);

src/main/java/org/fogbowcloud/manager/core/ConfigurationConstants.java

@@ -19,13 +19,16 @@ public class ConfigurationConstants {
 	public static final String MEMBER_PICKER_PLUGIN_CLASS_KEY = "member_picker_class";
 	public static final String IDENTITY_CLASS_KEY = "identity_class";
 	public static final String MEMBER_VALIDATOR_CLASS_KEY = "member_validator_class";
+	public static final String LOCAL_CREDENTIALS_CLASS_KEY = "federation_user_credentail_class";
 
 	// prefixs
 	public static final String LOCAL_PREFIX = "local_";
 	public static final String FEDERATION_PREFIX = "federation_";
 	public static final String PREFIX_FLAVORS = "flavor_";
+	public static final String OCCI_EXTRA_RESOURCES_PREFIX = "occi_extra_resource_";
 
 	// periods
+	public static final String ORDER_BD_UPDATER_PERIOD_KEY = "order_bd_updater_period";
 	public static final String SCHEDULER_PERIOD_KEY = "scheduler_period";
 	public static final String INSTANCE_MONITORING_PERIOD_KEY = "instance_monitoring_period";
 	public static final String TOKEN_UPDATE_PERIOD_KEY = "token_update_period";
@@ -48,4 +51,10 @@ public class ConfigurationConstants {
 	public static final String HTTP_PORT_KEY = "http_port";
 
 	public static final String PROP_MAX_WHOISALIVE_MANAGER_COUNT = "max_whoisalive_manager_count";
+	
+	// OCCI extra resource
+	public static final String OCCI_EXTRA_RESOURCES_KEY_PATH = "occi_extra_resource_file_path";
+	
+	// Instance Data Store
+	public static final String INSTANCE_DATA_STORE_URL = "instance_datastore_url";
 }