You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2014/04/01 18:08:07 UTC
[1/2] git commit: Fix for STRATOS-565: Adding support for tags as
key-pair values
Repository: incubator-stratos
Updated Branches:
refs/heads/master edd4054ab -> 9f6009c5c
Fix for STRATOS-565: Adding support for tags as key-pair values
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/424a6376
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/424a6376
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/424a6376
Branch: refs/heads/master
Commit: 424a6376afd7af78bc4070b9428d114d9ff2b6d6
Parents: a0e97c1
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 1 09:06:11 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 1 09:06:11 2014 -0700
----------------------------------------------------------------------
.../cloud/controller/iaases/AWSEC2Iaas.java | 17 +++++++++++++++++
.../controller/util/CloudControllerConstants.java | 1 +
2 files changed, 18 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/424a6376/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
index 56afc82..eafbade 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/AWSEC2Iaas.java
@@ -182,7 +182,22 @@ public class AWSEC2Iaas extends Iaas {
.split(CloudControllerConstants.ENTRY_SEPARATOR)));
}
+
+ // ability to define tags with Key-value pairs
+ Map<String, String> keyValuePairTagsMap = new HashMap<String, String>();
+
+ for (String propertyKey : iaasInfo.getProperties().keySet()){
+ if(propertyKey.startsWith(CloudControllerConstants.TAGS_AS_KEY_VALUE_PAIRS_PREFIX)) {
+ keyValuePairTagsMap.put(propertyKey.substring(CloudControllerConstants.TAGS_AS_KEY_VALUE_PAIRS_PREFIX.length()),
+ iaasInfo.getProperties().get(propertyKey));
+ template.getOptions()
+ .as(AWSEC2TemplateOptions.class)
+ .userMetadata(keyValuePairTagsMap);
+ }
+
+ }
+
if (iaasInfo.getProperty(CloudControllerConstants.SECURITY_GROUP_IDS) != null) {
template.getOptions()
.as(AWSEC2TemplateOptions.class)
@@ -197,6 +212,8 @@ public class AWSEC2Iaas extends Iaas {
.keyPair(iaasInfo.getProperty(CloudControllerConstants.KEY_PAIR));
}
+
+
if (iaasInfo.getNetworkInterfaces() != null) {
List<String> networks = new ArrayList<String>(iaasInfo.getNetworkInterfaces().length);
for (NetworkInterface ni:iaasInfo.getNetworkInterfaces()) {
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/424a6376/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index c7c77a2..413d5e9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@ -248,6 +248,7 @@ public final class CloudControllerConstants {
public static final String SECURITY_GROUPS = "securityGroups";
public static final String SUBNET_ID = "subnetId";
public static final String TAGS = "tags";
+ public static final String TAGS_AS_KEY_VALUE_PAIRS_PREFIX = "tag:";
public static final String AUTO_ASSIGN_IP = "autoAssignIp";
public static final String INSTANCE_TYPE = "instanceType";
public static final String ASSOCIATE_PUBLIC_IP_ADDRESS = "associatePublicIpAddress";
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-stratos
Posted by la...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/9f6009c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/9f6009c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/9f6009c5
Branch: refs/heads/master
Commit: 9f6009c5c2b60c62e44e87b604a353b7eb67e712
Parents: 424a637 edd4054
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Apr 1 09:06:17 2014 -0700
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Apr 1 09:06:17 2014 -0700
----------------------------------------------------------------------
README.md | 151 +-
.../controller/iaases/OpenstackNovaIaas.java | 24 +-
.../impl/CloudControllerServiceImpl.java | 9 +-
.../cloud/controller/interfaces/Iaas.java | 10 +-
.../util/CloudControllerConstants.java | 1 +
.../console/README | 35 +-
.../console/README.md | 11 -
.../console/cartridge_info.jag | 22 +-
.../console/cartridges.jag | 22 +-
.../console/configure_stratos.jag | 22 +-
.../console/configure_stratos_wizard.jag | 22 +-
.../console/controllers/acs.jag | 22 +-
.../controllers/cartridgeDefintionSubmit.jag | 23 +-
.../controllers/cartridgeSubscribeSubmit.jag | 23 +-
.../controllers/cartridgeUnsubscribeSubmit.jag | 22 +-
.../console/controllers/checkAvailability.jag | 22 +-
.../console/controllers/dashboard.jag | 22 +-
.../console/controllers/lbDefinitionSubmit.jag | 22 +-
.../console/controllers/login.jag | 22 +-
.../console/controllers/loginSubmit.jag | 22 +-
.../console/controllers/logout.jag | 23 +-
.../console/controllers/manageTenants.jag | 22 +-
.../console/controllers/mycartridges.jag | 22 +-
.../console/controllers/newTenantSubmit.jag | 22 +-
.../controllers/partitionDefinitionSubmit.jag | 22 +-
.../console/controllers/payloadFactory.jag | 22 +-
.../controllers/policyDefinitionSubmit.jag | 22 +-
.../console/controllers/profileClient.jag | 22 +-
.../console/controllers/router.jag | 20 +
.../console/controllers/wizardSubmit.jag | 22 +-
.../console/dashboard.jag | 22 +-
.../console/default_page.jag | 22 +-
.../console/index.jag | 22 +-
.../console/login.jag | 22 +-
.../console/permission-mapping.txt | 19 -
.../console/root-js | 369 -----
.../console/subscribe_cartridge.jag | 22 +-
.../console/tenant_management.jag | 22 +-
.../console/tenant_new.jag | 22 +-
.../console/themes/theme1/pages/index.hbs | 22 +-
.../console/themes/theme1/pages/plain.hbs | 21 +
.../console/themes/theme1/partials/404.hbs | 21 +
.../themes/theme1/partials/cartridge_info.hbs | 227 +--
.../themes/theme1/partials/cartridges.hbs | 67 +-
.../theme1/partials/configure_stratos.hbs | 31 +-
.../partials/configure_stratos_wizard.hbs | 31 +-
.../themes/theme1/partials/dashboard.hbs | 25 +-
.../themes/theme1/partials/error_page.hbs | 21 +
.../console/themes/theme1/partials/header.hbs | 657 ++++-----
.../console/themes/theme1/partials/login.hbs | 69 +-
.../themes/theme1/partials/mycartridges.hbs | 67 +-
.../theme1/partials/subscribe_cartridge.hbs | 423 +++---
.../theme1/partials/tenant_management.hbs | 25 +-
.../themes/theme1/partials/tenant_new.hbs | 23 +-
.../console/themes/theme1/partials/title.hbs | 23 +-
.../themes/theme1/renderers/cartridge_info.js | 2 +-
.../themes/theme1/renderers/cartridges.js | 2 +-
.../themes/theme1/renderers/tenant_new.js | 2 +-
.../theme1/subthemes/theme2/ui/css/main.css | 23 +-
.../console/themes/theme1/ui/404.html | 178 ---
.../themes/theme1/ui/Open_Sans/open_sans.css | 23 +-
.../ui/apple-touch-icon-114x114-precomposed.png | Bin 1189 -> 0 bytes
.../ui/apple-touch-icon-144x144-precomposed.png | Bin 1475 -> 0 bytes
.../ui/apple-touch-icon-57x57-precomposed.png | Bin 730 -> 0 bytes
.../ui/apple-touch-icon-72x72-precomposed.png | Bin 854 -> 0 bytes
.../theme1/ui/apple-touch-icon-precomposed.png | Bin 730 -> 0 bytes
.../themes/theme1/ui/apple-touch-icon.png | Bin 730 -> 0 bytes
.../console/themes/theme1/ui/crossdomain.xml | 36 -
.../console/themes/theme1/ui/css/dialog.css | 21 +
.../console/themes/theme1/ui/css/main.css | 1139 +++++++--------
.../theme1/ui/custom-font-new/LICENSE.txt | 9 +
.../theme1/ui/custom-font-new/config.json | 532 +++++++
.../ui/custom-font-new/css/fontello-codes.css | 80 +-
.../custom-font-new/css/fontello-embedded.css | 92 +-
.../custom-font-new/css/fontello-ie7-codes.css | 80 +-
.../ui/custom-font-new/css/fontello-ie7.css | 80 +-
.../theme1/ui/custom-font-new/css/fontello.css | 92 +-
.../themes/theme1/ui/custom-font-new/demo.html | 214 ++-
.../theme1/ui/custom-font-new/font/fontello.eot | Bin 30296 -> 42600 bytes
.../theme1/ui/custom-font-new/font/fontello.svg | 80 +-
.../theme1/ui/custom-font-new/font/fontello.ttf | Bin 30128 -> 42432 bytes
.../ui/custom-font-new/font/fontello.woff | Bin 22732 -> 30096 bytes
.../console/themes/theme1/ui/favicon.ico | Bin 766 -> 0 bytes
.../ui/font-awesome/css/font-awesome-ie7.css | 1203 ----------------
.../font-awesome/css/font-awesome-ie7.min.css | 384 -----
.../theme1/ui/font-awesome/css/font-awesome.css | 1338 ------------------
.../ui/font-awesome/css/font-awesome.min.css | 4 -
.../theme1/ui/font-awesome/font/FontAwesome.otf | Bin 61896 -> 0 bytes
.../font-awesome/font/fontawesome-webfont.eot | Bin 37405 -> 0 bytes
.../font-awesome/font/fontawesome-webfont.svg | 399 ------
.../font-awesome/font/fontawesome-webfont.ttf | Bin 79076 -> 0 bytes
.../font-awesome/font/fontawesome-webfont.woff | Bin 43572 -> 0 bytes
.../ui/font-awesome/fonts/FontAwesome.otf | Bin 62856 -> 0 bytes
.../font-awesome/fonts/fontawesome-webfont.eot | Bin 38205 -> 0 bytes
.../font-awesome/fonts/fontawesome-webfont.svg | 414 ------
.../font-awesome/fonts/fontawesome-webfont.ttf | Bin 80652 -> 0 bytes
.../font-awesome/fonts/fontawesome-webfont.woff | Bin 44432 -> 0 bytes
.../themes/theme1/ui/fonts/dropped text.txt | 1 -
.../ui/fonts/glyphicons-halflings-regular.eot | Bin 14079 -> 0 bytes
.../ui/fonts/glyphicons-halflings-regular.svg | 228 ---
.../ui/fonts/glyphicons-halflings-regular.ttf | Bin 29512 -> 0 bytes
.../ui/fonts/glyphicons-halflings-regular.woff | Bin 16448 -> 0 bytes
.../console/themes/theme1/ui/fonts/stratos.eot | Bin 6316 -> 0 bytes
.../console/themes/theme1/ui/fonts/stratos.svg | 20 -
.../console/themes/theme1/ui/fonts/stratos.ttf | Bin 6152 -> 0 bytes
.../console/themes/theme1/ui/fonts/stratos.woff | Bin 6228 -> 0 bytes
.../console/util/acl.jag | 22 +-
.../console/util/utility.jag | 20 +
.../sso/views/login.jag | 277 ++--
.../sso/views/stratos-resources/css/main.css | 313 ++--
.../behaviour/CartridgeMgtBehaviour.java | 5 +-
.../service/ServiceDeploymentManager.java | 7 +
.../category/DefaultLoadBalancerCategory.java | 12 +-
.../lb/category/LoadBalancerCategory.java | 7 +-
.../manager/CartridgeSubscriptionManager.java | 4 +-
.../subscription/LBCartridgeSubscription.java | 30 +-
.../rest/endpoint/services/ServiceUtils.java | 2 +-
.../src/main/resources/addTenantRequest.txt | 4 -
.../src/main/resources/getTenantList.txt | 1 -
.../src/main/resources/AutoScalerService.wsdl | 24 +-
.../main/resources/CloudControllerService.wsdl | 24 +-
.../InstanceCleanupNotificationService.wsdl | 24 +-
.../resources/add_entry_zone_file.sh | 70 -
.../resources/billing-mysql.sql | 143 --
.../stratos-installer/resources/db.stratos.com | 15 -
tools/stratos-installer/resources/git | 74 -
.../resources/gitolite-suexec-wrapper.sh | 30 -
.../resources/metering_mysql.sql | 172 ---
tools/stratos-installer/resources/notify.php | 62 -
tools/stratos-installer/resources/registry.sql | 407 ------
.../resources/remove_entry_zone_file.sh | 75 -
.../resources/stratos_foundation.sql | 159 ---
tools/stratos-installer/resources/userstore.sql | 481 -------
tools/stratos-installer/stratos-setup.sh | 45 +-
134 files changed, 4138 insertions(+), 8090 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/9f6009c5/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
----------------------------------------------------------------------
diff --cc components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
index 413d5e9,eaa4d60..3b81dc8
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerConstants.java
@@@ -248,8 -248,8 +248,9 @@@ public final class CloudControllerConst
public static final String SECURITY_GROUPS = "securityGroups";
public static final String SUBNET_ID = "subnetId";
public static final String TAGS = "tags";
+ public static final String TAGS_AS_KEY_VALUE_PAIRS_PREFIX = "tag:";
public static final String AUTO_ASSIGN_IP = "autoAssignIp";
+ public static final String BLOCK_UNTIL_RUNNING = "blockUntilRunning";
public static final String INSTANCE_TYPE = "instanceType";
public static final String ASSOCIATE_PUBLIC_IP_ADDRESS = "associatePublicIpAddress";
public static final String LB_CLUSTER_ID_COL = "lbclusterId";