GutoVeronezi commented on code in PR #8347:
URL: https://github.com/apache/cloudstack/pull/8347#discussion_r1491681359
##########
plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffUpdateCmd.java:
##########
@@ -67,6 +67,9 @@ public class QuotaTariffUpdateCmd extends BaseCmd {
"value will be applied. Inform empty to remove the activation
rule.", length = 65535, since = "4.18.0.0")
private String activationRule;
+ @Parameter(name = ApiConstants.POSITION, type = CommandType.INTEGER,
description = "Position in the execution sequence for tariffs of the same
type", since = "4.19.0.0")
Review Comment:
```suggestion
@Parameter(name = ApiConstants.POSITION, type = CommandType.INTEGER,
description = "Position in the execution sequence for tariffs of the same
type", since = "4.20.0.0")
```
##########
test/integration/plugins/test_quota_tariff_order.py:
##########
@@ -0,0 +1,189 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+""" Test cases for checking quota API
+"""
+
+# Import Local Modules
+import tools.marvin.marvin
+from tools.marvin.marvin.cloudstackTestCase import *
+from tools.marvin.marvin.cloudstackAPI import *
+from tools.marvin.marvin.lib.utils import *
+from tools.marvin.marvin.lib.base import *
+from tools.marvin.marvin.lib.common import *
+from nose.plugins.attrib import attr
+
+# Import System modules
+import time
+
+
+class TestQuotaTariffOrder(cloudstackTestCase):
+
+ @classmethod
+ def setUpClass(cls):
+ testClient = super(TestQuotaTariffOrder, cls).getClsTestClient()
+ cls.api_client = testClient.getApiClient()
+ cls.services = testClient.getParsedTestDataConfig()
+
+ # Get Zone, Domain and templates
+ cls.domain = get_domain(cls.api_client)
+ cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
+
+ # Create Account
+ cls.account = Account.create(
+ cls.api_client,
+ cls.services["account"],
+ domainid=cls.domain.id
+ )
+ cls._cleanup = [
+ cls.account,
+ ]
+
+ cls.services["account"] = cls.account.name
+
+ return
+
+ @classmethod
+ def tearDownClass(cls):
+ try:
+ # Cleanup resources used
+ cleanup_resources(cls.api_client, cls._cleanup)
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def setUp(self):
+ self.apiclient = self.testClient.getApiClient()
+ self.dbclient = self.testClient.getDbConnection()
+ self.cleanup = []
+ self.tariffs = []
+ return
+
+ def tearDown(self):
+ try:
+ cleanup_resources(self.api_client, self.cleanup)
+ self.delete_tariffs()
+ except Exception as e:
+ raise Exception("Warning: Exception during cleanup : %s" % e)
+ return
+
+ def delete_tariffs(self):
+ for tariff in self.tariffs:
+ cmd = quotaTariffDelete.quotaTariffDeleteCmd()
+ cmd.id = tariff.uuid
+ self.api_client.quotaTariffDelete(cmd)
+
+ @attr(
+ tags=[
+ "advanced",
+ "smoke"],
+ required_hardware="false")
+ def test_01_quota_tariff_order(self):
+ """Test Quota Tariff Order
+ """
+
+ cmd = quotaTariffCreate.quotaTariffCreateCmd()
+ cmd.name = 'tf1'
+ cmd.value = '1'
+ cmd.activationrule = '10'
+ cmd.usagetype = '22'
+ cmd.position = '2'
+ self.tariffs.append(self.api_client.quotaTariffCreate(cmd))
+
+ cmd = quotaTariffCreate.quotaTariffCreateCmd()
+ cmd.name = 'tf2'
+ cmd.value = '1'
+ cmd.activationrule = 'lastTariffs[lastTariffs.length -1].value + 7'
+ cmd.usagetype = '22'
+ cmd.position = '3'
+ self.tariffs.append(self.api_client.quotaTariffCreate(cmd))
+
+ cmd = quotaTariffCreate.quotaTariffCreateCmd()
+ cmd.name = 'tf3'
+ cmd.value = '1'
+ cmd.activationrule = 'lastTariffs[lastTariffs.length -2].value +
lastTariffs[lastTariffs.length -1].value'
+ cmd.usagetype = '22'
+ cmd.position = '4'
+ self.tariffs.append(self.api_client.quotaTariffCreate(cmd))
+
+ cmd = quotaCredits.quotaCreditsCmd()
+ cmd.account = self.account.name
+ cmd.domainid = self.domain.id
+ cmd.value = 54
+ self.api_client.quotaCredits(cmd)
+
+ # Fetch account ID from account_uuid
+ self.debug("select id from account where uuid = '%s';"
+ % self.account.id)
+
+ qresultset = self.dbclient.execute(
+ "select id from account where uuid = '%s';"
+ % self.account.id
+ )
+
+ account_id = qresultset[0][0]
+
+ self.debug("SELECT id from `domain` d WHERE uuid = '%s';"
+ % self.domain.id)
+
+ qresultset = self.dbclient.execute(
+ "SELECT id from `domain` d WHERE uuid = '%s';"
+ % self.domain.id
+ )
+
+ domain_id = qresultset[0][0]
+
+ self.debug("SELECT id from data_center dc where dc.uuid = '%s';"
+ % self.zone.id)
+
+ qresultset = self.dbclient.execute(
+ "SELECT id from data_center dc where dc.uuid = '%s';"
+ % self.zone.id
+ )
+
+ zone_id = qresultset[0][0]
+
+ start = datetime.datetime.now() + datetime.timedelta(seconds=1)
+ end = datetime.datetime.now() + datetime.timedelta(hours=1)
+
+ self.debug("INSERT INTO cloud_usage.cloud_usage
(zone_id,account_id,domain_id,description,usage_display,"
+
"usage_type,raw_usage,vm_instance_id,vm_name,offering_id,template_id,usage_id,`type`,`size`,"
+
"network_id,start_date,end_date,virtual_size,cpu_speed,cpu_cores,memory,quota_calculated,"
+ "is_hidden,state) VALUES ('{}','{}','{}','Test','1
Hrs',22,1,NULL,NULL,NULL,NULL,NULL,"
+
"'VirtualMachine',NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL,0,0,NULL);"
+ .format(zone_id, account_id, domain_id, start, end))
+
+ self.dbclient.execute(
+ "INSERT INTO cloud_usage.cloud_usage
(zone_id,account_id,domain_id,description,usage_display,usage_type,"
+
"raw_usage,vm_instance_id,vm_name,offering_id,template_id,usage_id,`type`,`size`,network_id,"
+
"start_date,end_date,virtual_size,cpu_speed,cpu_cores,memory,quota_calculated,is_hidden,"
+ "state) VALUES ('{}','{}','{}','Test','1
Hrs',22,1,NULL,NULL,NULL,NULL,NULL,'VirtualMachine',"
+ "NULL,NULL,'{}','{}',NULL,NULL,NULL,NULL,0,0,NULL);"
+ .format(zone_id, account_id, domain_id, start, end))
Review Comment:
The string could be extracted to a variable.
##########
plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java:
##########
@@ -66,6 +66,9 @@ public class QuotaTariffCreateCmd extends BaseCmd {
+ " endDate=2009-06-03.")
private Date endDate;
+ @Parameter(name = ApiConstants.POSITION, type = CommandType.INTEGER,
description = "Position in the execution sequence for tariffs of the same
type", since = "4.19.0.0")
Review Comment:
```suggestion
@Parameter(name = ApiConstants.POSITION, type = CommandType.INTEGER,
description = "Position in the execution sequence for tariffs of the same
type", since = "4.20.0.0")
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
