29101 Commits

Author SHA1 Message Date
Nitin Kumar Maharana
b02e9f0010 CLOUDSTACK-9235: Autoscale button is missing in VPC
In case of VPC, it checks the services available.
If LB is there, It checks the provider is Netscaler then it shows the button or hides it.
2016-01-14 12:04:13 +05:30
Remi Bergsma
80703ca33c Merge pull request #1325 from remibergsma/vpc_ui_fix_47
CLOUDSTACK-9221 Allow admin to see user VMs on port forwarding pageOn commit a902443708ee10acb9f68fff74af346a6a9fb370 the 'listAll=true' is removed. On some places the domainid and accountid are added but not on these. I added them now.

It's either doing this, or readding listAll is true. I've seeing other folks doing that so let's see what performs best.

* pr/1325:
  Admin cannot see VMs on port forwarding page

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-11 16:19:46 +01:00
Remi Bergsma
4b974c599b Merge pull request #1327 from remibergsma/47_sort_domain_list_ui
CLOUDSTACK-9220 Sort list of domains on Domain tab in UIThe list of domains was unsorted and that annoyed me so I sorted it :-)

* pr/1327:
  CLOUDSTACK-9220 Sort list of domains on Domain tab in UI

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-11 16:18:33 +01:00
Remi Bergsma
93bbc1afb7 CLOUDSTACK-9220 Sort list of domains on Domain tab in UI 2016-01-09 21:02:38 +01:00
Remi Bergsma
f186181910 Admin cannot see VMs on port forwarding page
On commir a902443708ee10acb9f68fff74af346a6a9fb370 the 'listAll=true'
is removed. On some places the domainid and accountid are added but not
on these. I added them now.

It's either doing this, or readding listAll is true. I've seeing other
folks doing that so let's see what performs best.
2016-01-08 22:00:01 +01:00
Remi Bergsma
456d854480 Merge pull request #1314 from lttmtins/4.7-CLOUDSTACK-8966
Fix mariadb related listCapacity bug (CLOUDSTACK-8966)type bigint(20) with type  varchar does not work well on MariaDB
So forcing it to type decimal

* pr/1314:
  Fix mariadb related listCapacity bug (CLOUDSTACK-8966)

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-08 20:10:31 +01:00
Remi Bergsma
3ee53d3f53 Merge pull request #1311 from ekholabs/fix/4.7-acl-cidrs-CLOUDSTACK-9213
CLOUDSTACK-9213 - As a user I want to be able to use multiple ip's/cidrs in an ACLThis PR fixes a problem with iptables when creating ACL items using a comma separated value list of CIDRs. Please refer to the details in the Jira issue.

* pr/1311:
  CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
  CLOUDSTACK-9213 - Formatting the code

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-07 12:07:43 +01:00
Anton Opgenoort
65d39d0346 Fix mariadb related listCapacity bug (CLOUDSTACK-8966)
type bigint(20) with type  varchar does not work well on MariaDB
So forcing it to type decimal
2016-01-07 10:21:13 +01:00
Wilder Rodrigues
94c0dc5dfe CLOUDSTACK-9213 - Split the ACL rules using comma instead of dash.
- The router code no longer deals with parsing the ALC list again. It's not necessary if it's sent in the proper way.
2016-01-06 09:48:53 +01:00
Wilder Rodrigues
61f3706255 CLOUDSTACK-9213 - Formatting the code 2016-01-06 09:48:32 +01:00
Remi Bergsma
d6815742b8 Merge pull request #1306 from shapeblue/4.7-quota-test
4.7 quota testQuotaStatementTest: fix the method invocation verification

* pr/1306:
  QuotaStatementTest: fix the method invocation verification

Signed-off-by: Remi Bergsma <github@remi.nl>
2016-01-05 15:24:47 +01:00
Abhinandan Prateek
0eac900fc4 QuotaStatementTest: fix the method invocation verification 2016-01-05 11:04:33 +05:30
Remi Bergsma
9be76b350f Merge pull request #1267 from remibergsma/471_version
Set version 4.7.1-SNAPSHOT in 4.7 branch- setnextversion.sh
- upgrade path

Build succeeds:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 10:04 min
[INFO] Finished at: 2015-12-21T20:37:29+01:00
[INFO] Final Memory: 126M/1635M
[INFO] ------------------------------------------------------------------------
```

* pr/1267:
  Debian changelog updated
  Implement upgrade path 4.7.0 -> 4.7.1
  Updating pom.xml version numbers for release 4.7.1-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 21:56:02 +01:00
Remi Bergsma
0779362f0e Debian changelog updated 2015-12-21 21:29:31 +01:00
Remi Bergsma
04c759390b Implement upgrade path 4.7.0 -> 4.7.1 2015-12-21 20:25:54 +01:00
Remi Bergsma
5b112408c7 Updating pom.xml version numbers for release 4.7.1-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 19:55:04 +01:00
Remi Bergsma
e213fa50be Merge release branch '4.6' into 4.7
* 4.6:
  Implement upgrade path 4.6.2 -> 4.6.3
  Updating pom.xml version numbers for release 4.6.3-SNAPSHOT

Merge made with the 'ours' strategy.
2015-12-21 19:49:49 +01:00
Remi Bergsma
451ae2bab8 Merge pull request #1265 from remibergsma/463_version
Set version 4.6.3-SNAPSHOT in 4.6 branch- setnextversion.sh
- upgrade path

Build succeeds:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 08:44 min
[INFO] Finished at: 2015-12-21T14:13:29+01:00
[INFO] Final Memory: 123M/1578M
[INFO] ------------------------------------------------------------------------
```

Will try upgrade soon.

* pr/1265:
  Implement upgrade path 4.6.2 -> 4.6.3
  Updating pom.xml version numbers for release 4.6.3-SNAPSHOT

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 15:02:52 +01:00
Remi Bergsma
6646c7df61 Implement upgrade path 4.6.2 -> 4.6.3 2015-12-21 13:55:00 +01:00
Remi Bergsma
2b76f394c0 Updating pom.xml version numbers for release 4.6.3-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-21 13:53:54 +01:00
Remi Bergsma
2f26a859a9 Updating pom.xml version numbers for release 4.7.0
Signed-off-by: Remi Bergsma <github@remi.nl>
4.7.0 4.7.0-rc1
2015-12-13 21:09:53 +01:00
Remi Bergsma
7c83e1b240 Merge pull request #1205 from shapeblue/master-9126
QUOTA: Ensuring that the dates displayed are as per user expectations    When querying db we use start of next day to query quota usage for
    today, but while displaying it to user we still need to show it as
    todays date

* pr/1205:
  QUOTA: Ensuring that the dates displayed are as per user expectations

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 21:08:10 +01:00
Remi Bergsma
c1533a1918 Merge pull request #1239 from remibergsma/fix-debian-changelog
build_asf.sh: fix debian changelog alteringThe script already adds a new entry so we shouldn't replace the
previous one. That is done only in the next version script.

As discussed with @DaanHoogland

* pr/1239:
  build_asf.sh: fix debian changelog altering

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 20:47:51 +01:00
Remi Bergsma
97b5e12704 build_asf.sh: fix debian changelog altering
The script already adds a new entry so we shouldn't replace the
previous one. That is done only in the next version script.
2015-12-13 20:41:56 +01:00
Remi Bergsma
7c9a8c1740 Merge pull request #1234 from shapeblue/master-9153
CLOUDSTACK-9153: When negative credits are added to an account theWhen negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

* pr/1234:
  CLOUDSTACK-9153: When negative credits are added to an account the balance credits can become negative for that account. This will fix will lock the account if quota is enforced.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 20:03:59 +01:00
Remi Bergsma
9862b2c780 Merge pull request #1217 from milamberspace/L10N-update-before-4.7.0RC1
L10N update before 4.7.0 RC1Some sentences (mainly for the new quota plugin) needs to be translated before the 4.7.0 release candidate (planned for 14th december)
https://www.transifex.com/ke4qqq/CloudStack_UI/47xmessagesproperties/

Stats:
German (Germany)            100%
French (France)             100%
Portuguese (Brazil)          98%
Norwegian Bokml (Norway)    98%
Dutch (Netherlands)          98%
Chinese (China)              97%
Japanese (Japan)             97%
Hungarian                    96%
(only languages over 90%)

Ping me after adding the L10N strings into transifex, I will update this PR.

Thanks

cc @remibergsma @agneya2001 @DaanHoogland @nvazquez @barunhalder1234 @K0zka

* pr/1217:
  Update L10N resource files with 4.7 strings from Transifex (20151211)

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 19:41:44 +01:00
Daan Hoogland
50c20dab17 Merge release branch 4.6 to master
* 4.6:
  CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count
2015-12-13 19:04:22 +01:00
Daan Hoogland
5774b965f3 Merge pull request #1209 from ustcweizhou/free-deviceid
CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count
when we restart vpc tiers, the old nics will be removed, and create a new nic.
however, the device_id was set to the nic count, which may be already used.
this commit get the first device_id not in use as the device_id of new nic.

This issue also happen when we add multiple networks to a vm and remove them.

* pr/1209:
  CLOUDSTACK-9134: set device_id as the first device_id not in use instead of nic count

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-13 18:43:30 +01:00
Remi Bergsma
08a1b11c11 Merge release branch 4.6 to master
* 4.6:
  CLOUDSTACK-9155 make sure logrotate is effective
2015-12-13 14:31:24 +01:00
Remi Bergsma
d7b7171870 Merge pull request #1235 from remibergsma/fix-passwd-server-logging
CLOUDSTACK-9155 make sure logrotate is effective for cloud.logMany processes on the VRs log to cloud.log. When log rotate kicks in, the file is rotated but the scripts still write to the old inode (cloud.log.1 after rotate). Tis quickly fills up the tiny log partition.

Using 'copytruncate' is a small tradeoff, there is a slight change of missing a log entry, but in the old situation nothing ended up in cloud.log after rotate (except for stuff that was (re)started) so I think this is the best solution until we properly rewrite the script to either use their own script or syslog.

More details: https://issues.apache.org/jira/browse/CLOUDSTACK-9155

* pr/1235:
  CLOUDSTACK-9155 make sure logrotate is effective

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 14:30:07 +01:00
Remi Bergsma
636efa2da3 CLOUDSTACK-9155 make sure logrotate is effective
Many processes on the VRs log to cloud.log. When logrotate
kicks in, the file is rotated but the scripts still write
to the old inode (cloud.log.1 after rotate). Tis quickly
fills up the tiny log partition.

Using 'copytruncate' is a tradeoff, there is a slight
change of missing a log entry, but in the old situation
we were missing all of them after logrotate.
2015-12-13 12:07:20 +01:00
Abhinandan Prateek
5025011d31 CLOUDSTACK-9153: When negative credits are added to an account the
balance credits can become negative for that account. This will fix will
lock the account if quota is enforced.
2015-12-13 09:28:02 +05:30
Remi Bergsma
90cea824e7 Merge release branch 4.6 to master
* 4.6:
  CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file
2015-12-13 00:14:21 +01:00
Remi Bergsma
fcccaaad3f Merge pull request #1231 from ekholabs/fix/vrid-rvpc-CLOUDSTACK-9151
CLOUDSTACK-9151 - As a Developer I want the VRID to be set within the limits of KeepaliveDThis PR fixes a blocker issue!

   - Just like with RVRs, use the VRID 51 instead of making it dependent on the VPCID
   - Reason: arbitary unique number 0..255 used to differentiate multiple instances of vrrpd running on the same NIC (and hence same socket). virtual_router_id 51

* pr/1231:
  CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-13 00:13:37 +01:00
Remi Bergsma
a0ce671c6b Merge branch '4.6'
* 4.6:
  Implement 4.6.1 -> 4.6.2 upgrade path
2015-12-13 00:10:10 +01:00
Remi Bergsma
a7b098ff16 Implement 4.6.1 -> 4.6.2 upgrade path 2015-12-13 00:06:02 +01:00
Daan Hoogland
03ea65a3b7 Mark pom changes in branch '4.6' as merged 2015-12-12 23:24:40 +01:00
Daan Hoogland
1063508003 Merge pull request #1186 from remibergsma/462_version
Updating pom.xml version numbers for release 4.6.2-SNAPSHOTSet next version in 4.6 release branch to version 4.6.2-SNAPSHOT.

Using ` ./tools/build/setnextversion.sh`.

Ping @bhaisaab @DaanHoogland before we merge this, how will we be creating the upgrade paths from 4.6.2 to 4.7? After this PR is merged, we need to manually do a fwd-merge and make sure we keep the pom versions in master/4.7. Much like in #1071.

* pr/1186:
  Fixed typo in iam/pom.xml
  Updating pom.xml version numbers for release 4.6.2-SNAPSHOT

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-12 23:17:19 +01:00
Remi Bergsma
f032c72213 Merge pull request #1233 from DaanHoogland/master-4.6.1
4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1test build:

```
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 13:45 min
[INFO] Finished at: 2015-12-12T22:15:56+01:00
[INFO] Final Memory: 121M/914M
[INFO] ------------------------------------------------------------------------
 ~/cloudstack/cloudstack [master-4.6.1 21| 18]
```

* pr/1233:
  4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-12 22:54:43 +01:00
Remi Bergsma
1a463a1478 Merge pull request #1229 from borisroman/CLOUDSTACK-9150
CLOUDSTACK-9150: Remove docs/.tx/configThe config file docs/.tx/config has been replaced with tools/transifex/.tx/config. It's not maintained or used so it must be removed.

Builds ok:
```
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 6:51.685s
[INFO] Finished at: Sat Dec 12 15:23:38 CET 2015
[INFO] Final Memory: 102M/780M
[INFO] ------------------------------------------------------------------------
```
Running integration tests now! Ping @wido @wilderrodrigues @remibergsma @miguelaferreira

* pr/1229:
  Remove docs/.tx/config The config file docs/.tx/config has been replaced with tools/transifex/.tx/config. It's not maintained or used so it must be removed.

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-12 22:44:38 +01:00
Remi Bergsma
cdfcea3da2 Merge release branch 4.6 to master
* 4.6:
  [UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users
  CLOUDSTACK-4787: Allow users to select disk controller for VM/template
  CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere
2015-12-12 22:29:19 +01:00
Remi Bergsma
c456eeb959 Fixed typo in iam/pom.xml 2015-12-12 21:51:48 +01:00
Daan Hoogland
22a5621476 4.6.2 -> 4.7.0 upgrade does not use any scripts above 4.6.1 2015-12-12 21:51:14 +01:00
Remi Bergsma
5147dec4ff Updating pom.xml version numbers for release 4.6.2-SNAPSHOT
Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-12 21:49:37 +01:00
Remi Bergsma
e7030285a2 Merge pull request #1219 from DaanHoogland/CLOUDSTACK-9139
CLOUDSTACK-9139 make zwps default when defined on zone levelWhen a marvin definition contains a primary storage definition at zone level it will default to zone scope. A test run is underway.
using marvin config:
```
{
    "zones": [
        {
            "name": "MCCT-SHARED-1",
            "guestcidraddress": "10.1.1.0/24",
            "dns1": "8.8.8.8",
            "physical_networks": [
                {
                    "broadcastdomainrange": "Zone",
                    "vlan": "100-200",
                    "name": "mcct-pnet",
                    "traffictypes": [
                        {
                            "typ": "Guest"
                        },
                        {
                            "typ": "Management"
                        },
                        {
                            "typ": "Public"
                        }
                    ],
                    "providers": [
                        {
                            "broadcastdomainrange": "ZONE",
                            "name": "VirtualRouter"
                        },
                        {
                            "broadcastdomainrange": "ZONE",
                            "name": "VpcVirtualRouter"
                        },
                        {
                            "broadcastdomainrange": "ZONE",
                            "name": "InternalLbVm"
                        }
                    ],
                    "isolationmethods": [
                             "VLAN"
                    ]
                }
            ],
            "ipranges": [
                {
                    "startip": "192.168.23.2",
                    "endip": "192.168.23.20",
                    "netmask": "255.255.255.0",
                    "vlan": "50",
                    "gateway": "192.168.23.1"
                }
            ],
            "networktype": "Advanced",
            "pods": [
                {
                    "endip": "192.168.22.150",
                    "name": "MCCT-POD",
                    "startip": "192.168.22.130",
                    "netmask": "255.255.255.0",
                    "clusters": [
                    ],
                    "clusters": [
                        {
                            "clustername": "MCCT-KVM-1",
                            "hypervisor": "KVM",
                            "hosts": [
                                {
                                    "username": "root",
                                    "url": "http://kvm1",
                                    "password": "password"
                                },
                                {
                                    "username": "root",
                                    "url": "http://kvm2",
                                    "password": "password"
                                }
                            ],
                            "clustertype": "CloudManaged"
                        }
                    ],
                    "gateway": "192.168.22.1"
                }
            ],
            "internaldns1": "8.8.4.4",
            "secondaryStorages": [
                {
                    "url": "nfs://192.168.22.1:/data/storage/secondary/MCCT-SHARED-1",
                    "provider" : "NFS"
                }
            ],
            "primaryStorages": [
                {
                    "url": "nfs://192.168.22.1:/data/storage/primary/MCCT-KVM-1",
                    "name": "MCCT-KVM-1-primary",
                    "hypervisor": "kvm"
                }
            ]
        }
    ],
    "dbSvr": {
        "dbSvr": "localhost",
        "passwd": "cloud",
        "db": "cloud",
        "port": 3306,
        "user": "cloud"
    },
    "logger":
        {
            "LogFolderPath": "/tmp/"
        },
    "globalConfig": [
        {
            "name": "network.gc.wait",
            "value": "60"
        },
        {
            "name": "storage.cleanup.interval",
            "value": "300"
        },
        {
            "name": "vm.op.wait.interval",
            "value": "5"
        },
        {
            "name": "default.page.size",
            "value": "10000"
        },
        {
            "name": "network.gc.interval",
            "value": "60"
        },
        {
            "name": "workers",
            "value": "10"
        },
        {
            "name": "account.cleanup.interval",
            "value": "600"
        },
        {
            "name": "guest.domain.suffix",
            "value": "cloud"
        },
        {
            "name": "expunge.delay",
            "value": "60"
        },
        {
            "name": "vm.allocation.algorithm",
            "value": "firstfitleastconsumed"
        },
        {
            "name": "expunge.interval",
            "value": "60"
        },
        {
            "name": "expunge.workers",
            "value": "3"
        },
        {
            "name": "check.pod.cidrs",
            "value": "true"
        },
        {
            "name": "secstorage.allowed.internal.sites",
            "value": "192.168.22.0/24"
        },
        {
            "name": "direct.agent.load.size",
            "value": "1000"
        }
    ],
    "mgtSvr": [
        {
            "mgtSvrIp": "localhost",
            "passwd": "password",
            "user": "root",
            "port": 8096,
            "hypervisor": "KVM",
            "useHttps": "False",
            "certCAPath":  "NA",
            "certPath":  "NA"
        }
    ]
}
```
deploys succesful:
```
Deploy data center..

==== Log Folder Path: /tmp//MarvinLogs//DeployDataCenter__Dec_11_2015_16_27_55_AM5LVR. All logs will be available here ====

==== Deploy DC Started ====

=== Data Center Settings are dumped to /tmp//MarvinLogs//DeployDataCenter__Dec_11_2015_16_27_55_AM5LVR/dc_entries.obj===

====Deploy DC Successful=====
Fri Dec 11 16:32:02 GMT 2015
```

![screen shot 2015-12-11 at 17 37 12](https://cloud.githubusercontent.com/assets/2486961/11749410/e7d99db4-a02d-11e5-9a5b-e5d554a45945.png)

* pr/1219:
  CLOUDSTACK-9139 make zwps default when defined on zone level

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-12 21:02:08 +01:00
Milamber
6947afee3a Update L10N resource files with 4.7 strings from Transifex (20151211) 2015-12-12 18:57:10 +00:00
Wilder Rodrigues
2bebb7f8a3 CLOUDSTACK-9151 - Removes the replacement of the VRID in the CsRedundant file
- Just like with RVRs, use the VRID 51 instead of making it dependent on the VPCID
   - Reason: arbitary unique number 0..255 used to differentiate multiple instances of vrrpd running on the same NIC (and hence same socket). virtual_router_id 51
2015-12-12 16:26:00 +01:00
Boris Schrijver
27e23fb11c Remove docs/.tx/config
The config file docs/.tx/config has been replaced with tools/transifex/.tx/config. It's not maintained or used so it must be removed.
2015-12-12 15:13:48 +01:00
Remi Bergsma
1597a4c749 Merge pull request #1211 from ustcweizhou/delete-acl-items
[UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal usersOnly the owner or domain admin/admin can access the page (vpc->Network ACL Lists), they are also able to remove the network ACL lists, which is not allowed on UI.

* pr/1211:
  [UI] bug fix: Delete added ACL lists is not available for Domain Admin and normal users

Signed-off-by: Remi Bergsma <github@remi.nl>
2015-12-12 14:40:17 +01:00
Daan Hoogland
8c78f89c91 Merge pull request #1132 from shapeblue/4.6-vmware-diskcontrollers
[4.6] CLOUDSTACK-4787 - vmware diskcontrollersSame as #1131 (see this for screenshots etc)

* pr/1132:
  CLOUDSTACK-4787: Allow users to select disk controller for VM/template
  CLOUDSTACK-4787 Allow selection of scsi controller type in vSphere

Signed-off-by: Daan Hoogland <daan@onecht.net>
2015-12-12 14:38:28 +01:00