You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/07/06 13:35:58 UTC
[18/24] stratos git commit: removing UUID from the UI
removing UUID from the UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/96545c52
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/96545c52
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/96545c52
Branch: refs/heads/tenant-isolation
Commit: 96545c52182cefb6fcb6afd2bd3cda18fc98dd51
Parents: 52380b1
Author: Dinithi <di...@wso2.com>
Authored: Fri Jul 3 09:38:37 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Fri Jul 3 09:38:37 2015 +0530
----------------------------------------------------------------------
.../applications/parser/DefaultApplicationParser.java | 2 +-
.../apache/stratos/autoscaler/util/AutoscalerUtil.java | 2 +-
.../forms/default/configure/application-policies.json | 1 -
.../forms/default/configure/autoscaling-policies.json | 1 -
.../forms/default/configure/deployment-policies.json | 1 -
.../forms/default/configure/network-partitions.json | 1 -
.../forms/schema/configure/application-policies.json | 8 +-------
.../forms/schema/configure/autoscaling-policies.json | 11 +++--------
.../forms/schema/configure/deployment-policies.json | 9 ++-------
.../forms/schema/configure/network-partitions.json | 9 ++-------
10 files changed, 10 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
index a3ac423..d0f8514 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/applications/parser/DefaultApplicationParser.java
@@ -167,7 +167,7 @@ public class DefaultApplicationParser implements ApplicationParser {
"[cartridge-type] %s [alias] %s", applicationId, cartridgeType, alias));
}
- AutoscalePolicy autoscalingPolicy = PolicyManager.getInstance().getAutoscalePolicyById(autoscalingPolicyId);
+ AutoscalePolicy autoscalingPolicy = PolicyManager.getInstance().getAutoscalePolicy(autoscalingPolicyId);
if (autoscalingPolicy == null) {
handleError(String.format("Autoscaling policy is not found: [application-id] %s " +
"[cartridge-type] %s [alias] %s [autoscaling-policy] %s", applicationId, cartridgeType,
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
index c5ba3b9..8efdd1c 100644
--- a/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
+++ b/components/org.apache.stratos.autoscaler/src/main/java/org/apache/stratos/autoscaler/util/AutoscalerUtil.java
@@ -766,7 +766,7 @@ public class AutoscalerUtil {
int referencesOfNetworkPartition = 0;
for (String deploymentPolicyIDReferredInApp : deploymentPolicyIdsReferredInApplication) {
try {
- DeploymentPolicy deploymentPolicyInApp = PolicyManager.getInstance().getDeploymentPolicyById(deploymentPolicyIDReferredInApp);
+ DeploymentPolicy deploymentPolicyInApp = PolicyManager.getInstance().getDeploymentPolicy(deploymentPolicyIDReferredInApp);
if (deploymentPolicyInApp != null) {
for (NetworkPartitionRef networkPartitionOfDeploymentPolicy : deploymentPolicyInApp.getNetworkPartitionRefs()) {
if (networkPartitionOfDeploymentPolicy != null) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
index 0f92e09..008e079 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/application-policies.json
@@ -1,5 +1,4 @@
{
- "uuid": "",
"id": "application-policy-1",
"algorithm":"one-after-another",
"networkPartitions":[
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
index 7fa3c03..29c755f 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/autoscaling-policies.json
@@ -1,5 +1,4 @@
{
- "uuid": "",
"id": "economy",
"description":"autoscale policy description",
"loadThresholds": {
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
index f8ccf75..f749ab4 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/deployment-policies.json
@@ -1,5 +1,4 @@
{
- "uuid": "",
"id": "deployment-policy-1",
"networkPartitions": [
{
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
index 70f2899..0ad6424 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/network-partitions.json
@@ -1,5 +1,4 @@
{
- "uuid": "",
"id": "network-partition-1",
"provider": "mock",
"partitions": [
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
index b7ade53..b94c5b8 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/application-policies.json
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
- "uuid": "root",
+ "id": "root",
"type": "object",
"title": "Application Policy Definition",
"name": "Application Policy",
@@ -9,12 +9,6 @@
"disable_collapse": true
},
"properties": {
- "uuid": {
- "id": "root/uuid",
- "type": "string",
- "title": "Application Policy UUID ",
- "name": "Application Policy UUID"
- },
"id": {
"id": "root/id",
"type": "string",
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
index 21416ff..5b094f9 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscaling-policies.json
@@ -1,24 +1,19 @@
{
"type":"object",
"$schema": "http://json-schema.org/draft-04/schema",
- "uuid": "root",
+ "id": "root",
"title":"Auto-scaling Policy Definition",
- "name": "Auto-scaling Policy UUID",
+ "name": "Auto-scaling Policy",
"options": {
"disable_properties": true,
"disable_collapse": true
},
"required" : ["id", "loadThresholds"],
"properties":{
- "uuid": {
- "type":"string",
- "id": "root/uuid",
- "title":"Auto Scale policy UUID"
- },
"id": {
"type":"string",
"id": "root/id",
- "title":"Auto Scale policy ID",
+ "title":"Auto Scale policy Id",
"minLength":4,
"default":"Policy name",
"maxItems":1
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
index 2c78bee..29a27f1 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deployment-policies.json
@@ -1,6 +1,6 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
- "uuid": "root",
+ "id": "root",
"type": "object",
"title":"Deployment Policy Definition",
"name": "Deployment Policy",
@@ -9,15 +9,10 @@
"disable_collapse": true
},
"properties": {
- "uuid": {
- "id": "root/uuid",
- "type": "string",
- "title":"UUID"
- },
"id": {
"id": "root/id",
"type": "string",
- "title":"Deployment Policy ID"
+ "title":"Deployment Policy Id"
},
"networkPartitions": {
"id": "root/networkPartitions",
http://git-wip-us.apache.org/repos/asf/stratos/blob/96545c52/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
index 85bcfab..2332650 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json
@@ -1,19 +1,14 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
- "uuid": "root",
+ "id": "root",
"type": "object",
"title": "Network Partition Definition",
- "name": "Network Partition Policy",
+ "name": "Network Partition",
"options": {
"disable_properties": true,
"disable_collapse": true
},
"properties": {
- "uuid": {
- "id": "root/uuid",
- "type": "string",
- "title": "UUID"
- },
"id": {
"id": "root/id",
"type": "string",