Commit Graph

302 Commits

Author SHA1 Message Date
Darren Shepherd 67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Alex Huang b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Hugo Trippaers 15a97ec412 Cleanup pom.xml in various projects to properly use managed versions and other defaults 2013-09-21 17:21:06 +08:00
Laszlo Hornyak 3650f12e9b Do not instantiate long just to generate String
Replaced toString call to the static toString method

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-19 17:17:54 +02:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Anthony Xu 1f42153630 Revert "CLOUDSTACK-4649"
This reverts commit c82ef422b47fe2909ff79b7f91d2ba76bf007457.
2013-09-12 13:00:42 -07:00
Anthony Xu 1510139f15 CLOUDSTACK-4649
use the same virtual hardware platform in XS 6.2 as that in XS 6.0.2
2013-09-12 13:00:42 -07:00
Devdeep Singh 63f8b3f69b CLOUDSTACK-4617. Add host succeeds but host goes to alert state and comes back to UP state
after a short while. Fixed the link local network creation part.
2013-09-12 16:34:55 +05:30
Anthony Xu 4adf13192f CLOUDSTACK-4643
put host maintenance mode will not change XS master,
when you delete a host, and this host is master, master will be designated by CS
2013-09-11 15:52:09 -07:00
Wei Zhou 87d73e227f CLOUDSTACK-1192: GetVmDiskStatsCommand return null as disk I/O statistics does not support xen/vmware
(cherry picked from commit 3121133c03)
2013-09-02 16:04:59 +02:00
Daan Hoogland d9c06e538b CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods 2013-09-01 22:53:23 +02:00
Min Chen 49dd7289c0 CLOUDSTACK-4468:template created from snapshot is destroyed once we
restart management server.
2013-08-26 11:58:53 -07:00
Edison Su 1c96898ae1 CLOUDSTACK-3229: if delete snapshots on staging area failed, still treat backup snapshot as succeed. And modify snapshot delete logic on devcloud 2013-08-19 15:25:11 -07:00
Nitin Mehta 9de7e0af18 CLOUDSTACK-4386
XS Creating templates from volume - send the physical size in the copycommand which accordingly will populate template store ref and the usage_event tables with the right physical size
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-19 16:04:12 +05:30
Min Chen 8a104b95d5 CLOUDSTACK-2583: [Object_Store_Refactor] Failed to create snapshot from
root disk of a guest VM.
2013-08-14 18:02:25 -07:00
Harikrishna Patnala 726114a95d CLOUDSTACK-3850: CPU cap should be per VM not per VCPU
Signed-off-by: Koushik Das <koushik@apache.org>
2013-08-12 08:59:18 +05:30
Mike Tutkowski 798d8f1e4b cloudstack-4235 2013-08-10 17:37:43 -06:00
anthony 4333209af3 CLOUDSTACK-3495
CS used to access vnc server in xenserver dom0 to get VM console, now CS moves to use XenServer console API. getvncport plugin is not needed any more.
        remove the code related to getvncport in XenServer
2013-08-09 17:22:54 -07:00
Sanjay Tripathi d95e3dacd6 CLOUDSTACK-2448: XenServer Guest OS Mapping Corrections. 2013-08-09 18:49:02 +05:30
Sanjay Tripathi d6ebcd1924 CLOUDSTACK-4187: 2.2.1 - 4.2 Upgrade: Few Guest OS Types information is inconsistent on the Upgraded Setup when compared with the fresh 4.2 Installation. 2013-08-09 15:27:56 +05:30
Sanjay Tripathi 0b00e13e24 CLOUDSTACK-3723: System VM Template for XenServer has wrong guest OS type Information on the Database
Also added the debian 7 to debian 6 mapping in CitrixHelper file
to support the debian 7 template in XS 6.0, 6.0.2, 6,1 etc.
2013-08-07 12:57:11 +05:30
Anthony Xu 7bf37c1202 CLOUDSTACK-4017:
try to remove VDI host lock before start the VM which is using this VDI
2013-08-01 15:33:42 -07:00
Sanjay Tripathi ec9a797b4c CLOUDSTACK-4001: Unable to deploy Windows server 2012 64 bit VM on xenserver 6.2
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-01 21:04:52 +05:30
Chip Childers 8225374138 Updating pom.xml version numbers for release 4.3.0-SNAPSHOT
Signed-off-by: Chip Childers <chipchilders@apache.org>
2013-08-01 10:35:00 -04:00
John Burwell e25f185e64 - CLOUDSTACK-3229: Attempt to adjust snapshot source path to new cache
filesystem layout
2013-08-01 03:55:17 -04:00
John Burwell 6ec9a44429 - CLOUDSTACK-3229: Works around Introspector bug that does not recognize
Boolean typed accessor methods by manualy populating the https value.
A generic implementation will be investigated when time permits.
2013-08-01 01:54:54 -04:00
John Burwell e2bcbe90c0 - CLOUDSTACK-3229: Fixes a think-o in the handling of unmodifiable
collections and adds a rail in s3xen to raise an exception if the file being
put does not exist
2013-08-01 00:14:57 -04:00
John Burwell 1ae682de78 - CLOUDSTACK-3229: Properly serialize the https property to the s3Xen
plugin
  - Extracts the duplicated serializeProperties methods to
    ReflectUtils#flattenProperties
  - Adds unit tests for ReflectUtils#flattenProperties
2013-08-01 00:14:43 -04:00
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
John Burwell ceed152426 - CLOUDSTACK-3229: Passes the bucket name as "bucket" into the s3xen
plugin
2013-07-31 09:58:22 -04:00
Marcus Sorensen ac59a4f136 Summary: Move Xen vmdata to new, non-ssh method
Detail: KVM recently got a patch that did away with a few dozen ssh calls
when programming virtual router (CLOUDSTACK-3163), saving several seconds
for each vm served by the virtual router when the router is rebooted. This
patch updates Xen to use the same method, and cleans up the old script refs.

Reviewed-by: Sheng Yang, Prasanna Santhanam
2013-07-30 21:45:36 -06:00
Edison Su ae534388c0 CLOUDSTACK-3852: fix upload volume
Conflicts:

	plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
	server/src/com/cloud/template/TemplateManagerImpl.java
2013-07-29 11:50:16 -07:00
Harikrishna Patnala 2f369973e2 CLOUDSTACK-3779: Support System vm scaling on VMWare
Marked the system template new system template as dynamicallyScalable
   - handled upgrade case
   - moved "dynamicallyScalable" flag to vm_instance table from user_vm_details to support dynamic scaling of system vm
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-29 15:25:07 +05:30
Harikrishna Patnala 8ef097ef6e CLOUDSTACK-3669: Bringing down the dynamic scalable check (for VM whether it has xstools or vmware tools in it) to the management layer.
Signed off by : Nitin Mehta <nitin.mehta@citrix.com>
2013-07-29 15:16:21 +05:30
Alex Huang 3f7c558de5 Removed all the extra mockito, inject, and junit dependencies. Changed any test/resource to test/resources and rely on the master pom to tell us where the resources are instead of each individual project 2013-07-26 16:34:08 -07:00
Sanjay Tripathi 5b46e93d28 CLOUDSTACK-3544: Xen 6.2 hosts are tagged with Xen 6.1.
This commit will add the new xenserverresource file to support XenServer 6.2.
Also add the guest OS list supported by xenserver 6.2
2013-07-26 16:00:40 +05:30
Devdeep Singh c0ea76a77e CLOUDSTACK-3501. Cannot create instances on XenServer with multiple cores in a socket. If
details has information on cores per socket, create an instance accordingly. The vm record
is populated with information on how many cores should be allowed in a socket.
2013-07-26 15:10:43 +05:30
Devdeep Singh 62c8df9dcd CLOUDSTACK-3590. Adding new xenserver host to cluster fails in first attempt. While adding
a host to the pool it may take a little longer to join the pool. Increased the time the
resource waits and checks to make sure the host has joined as slave to the pool.
2013-07-26 11:01:29 +05:30
Edison Su 7f200d966e CLOUDSTACK-3681: fix bunch of bugs related to vmware, regarding to snapshot 2013-07-24 19:06:30 -07:00
Bharat Kumar e14f5d0aeb Cloudstack-3694 Dnsmasq rewrite in bash
(Sheng: Fix typo, fix log and error message, remove 'set -x' in script)

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-07-24 14:00:31 -07:00
Edison Su d22bea6031 CLOUDSTACK-2630: fix delta snashpt 2013-07-24 09:48:59 -07:00
Edison Su be3883b678 fix create template from snapshot if it's swift 2013-07-24 09:48:07 -07:00
Anthony Xu 089cbb610b when create local link netowrk fails for xenserver, adding host should fail 2013-07-23 15:19:05 -07:00
Alex Huang 319d91e1c2 Removed the getByTypeAndId() method and replace it with getById method 2013-07-22 20:06:04 -07:00
Anthony Xu 668089d575 correct the log message 2013-07-22 15:56:11 -07:00
Alex Huang 1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Wei Zhou d2c1ed4865 ui change: Disk I/O polling statistics 2013-07-22 16:06:10 +02:00
Edison Su c618caf102 fix localendpoint npe 2013-07-17 16:29:52 -07:00
Jayapal 2d6644d961 CLOUDSTACK-2433 Enable rps and rfs in virtual router 2013-07-17 16:59:59 +05:30
Devdeep Singh 033d05fa20 CLOUDSTACK-3443: Timeoffset on windows guest not persisted between VM stop and start on XenServer.
The problem was because in cloudstack when a vm is stopped it gets destroyed on the host. For a
windows vm the timeoffset (which can be set by changing the timezone from within the vm) is stored
in the platform:timeoffset attribute of vm record. The information is lost when the vm is destroted.
Made change to read and persist the platform:timeoffset vm attribute when an instance is stopped.
The value is persisted in the user_vm_details table. When the vm is started again the attribute is
set for the vm instance that gets created.
2013-07-10 17:36:06 +05:30
Mike Tutkowski 06f73092fb Changes related to Review Board comments 2013-07-09 22:50:14 -06:00
Nitin Mehta bb6cd764c7 CLOUDSTACK-3267
Improved logging by logging the memory values when exception is thrown for the constraint
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-07-04 14:24:41 +05:30
Hugo Trippaers 40f38521c4 It makes more sense to print the task uuid than the task type in the trace message
Add retry counter to exiting pong command message

Some additional code cleanup courtesy eclipse save actions, thanks Alex
2013-06-30 12:10:59 +02:00
Prasanna Santhanam 085e8838e4 Fix typo in backupSnapshotCommand
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-29 13:50:25 +05:30
Sanjay Tripathi 1659ee225c CLOUDSTACK-3082: System VMs are failed to start with Xen 6.2.0( Failing to create VIF's) 2013-06-29 05:39:33 +05:30
Hugo Trippaers ed00427989 Improve logging for CitrixResourceBase by replacing e.printStackTrace
with s_Logger.error.

Automatic cleanup using the eclipse settings from Alex
2013-06-28 16:45:31 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Hugo Trippaers 329c6eb4d3 Adding tracelogging to CitrixResourceBase xapi task handling.
Currently it is very hard to see which tasks are pending in cloudstack
that need to be executed by xapi. Ideally we would like to have a
central overview of all tasks centrally. But for now being able to
enable tracelogging should give some insight in what is going on.
2013-06-27 14:54:31 -07:00
Harikrishna Patnala 0d1f512728 CLOUDSTACK-3208: showing xenhost username and password details in plain text in logs when we pefrom removehost from CS
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 15:57:31 +05:30
Nitin Mehta ea7b4467d7 CLOUDSTACK-3050
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:45:57 +05:30
Nitin Mehta f90279d9bb CLOUDSTACK-3050
XS - Enforce recommended guest OS values for ram
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-06-26 15:44:48 +05:30
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Abhinandan Prateek 59d7c94247 CLOUDSTACK-3136: added Centsor 6.3 and Ubuntu 11.04 guest OS for Xen 6.1 2013-06-22 16:04:55 +05:30
Edison Su 205722aabf fix nonoss build 2013-06-20 10:47:19 -07:00
Edison Su 733ed3622d fix compile 2013-06-20 00:57:06 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Harikrishna Patnala b83b8eb838 CLOUDSTACK-2502: Scalevm and over provisioning should respect each other
During Scale up of VM, memory/cpu calculations should consider the memory/cpu overprovisioning factors which are set per cluster.

CLOUDSTACK-2939:  CPU limit is not getting set for vm after scaleup to a service offering which have cpu cap enabled

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 16:30:56 +05:30
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
venkataswamybabu budumuru fe506d9b68 CLOUDSTACK-2642: [XenServer] Add support for XenServer 6.2.0
Currently XcpServerDiscoverer.java is only allowing till XenServer 6.1.0. Added
code to support XenServer 6.2.0. Also, added support to allow the RC build
of XenSever 6.2.0.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-12 15:11:50 +05:30
Prasanna Santhanam da6f39b782 PlugNic and UnplugNic both call the method getVmName
Renaming the method in the command objects to be uniform with
PlugNicCommand/UnplugNicCommand.getVmName

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-05 12:37:42 +05:30
Bharat Kumar 48913679e8 CLOUDSTACK-2648 [Multiple_IP_Ranges] Reboot or start/stop router vm deletes the ip alises created on VR in case of multiple subnets
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-03 19:22:27 +05:30
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Nitin Mehta 0a5e3fa607 CLOUDSTACK-2060
Global config to turn off dynamically scale vm functionality
2013-05-30 15:11:08 +05:30
Nitin Mehta 8d1189c2ae CLOUDSTACK-2060
Global config to turn off dynamically scale vm functionality
2013-05-29 19:02:06 +05:30
Prasanna Santhanam 5b902c7005 CLOUDSTACK-2683: DevCloud systemVMs fail to launch
DevCloud is a XCP Kronos based xen. For this we use the XcpOssResource
whose memory limits were not set explicitly. Instead the base
CitrixResourceBase would set the limits. static_min was set to 128MB
failing the cpvm and ssvm start fails whose offerings have 100MB set to
the max limits.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-26 14:49:52 +05:30
Edison Su 3ec52807f1 CLOUDSTACK-2593: fix migrate volume between pools through secondary storage 2013-05-23 18:26:16 -07:00
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Devdeep Singh 85ff507094 CLOUDSTACK-2602. XenServer storage motion strategy returns true for canHandle even though hosts are of different hypervisor type. Fixed the canHandle routine to return true only if source and destination hosts are of type XenServer. 2013-05-22 17:47:11 +05:30
Nitin Mehta a67728b312 CLOUDSTACK-2567 - check for ! dmcEnabled. 2013-05-22 15:31:18 +05:30
Min Chen 01e36538aa Fix a bug in creating volume path in copy command. 2013-05-21 22:18:35 -07:00
Edison Su 383be568b3 CLOUDSTACK-2527: enable attach/detach xs tool iso 2013-05-21 19:13:29 -07:00
Edison Su 536feab856 when copy volume to secondary storage, need to add full volume path 2013-05-21 17:47:38 -07:00
Nitin Mehta a58ee74e1c CLOUDSTACK-2567 - Check whether DMC - dynamic memory control is enabled for the hyervisor before trying to scale the vm. If its not then dont scale and instead throw and exception. 2013-05-21 16:39:25 +05:30
Devdeep Singh 904a2a87f7 CLOUDSTACK-2601 : xen.heartbeat.interval doesn't change the parameter passed to xenheartbeat.sh. Made changes to read the parameter from config and to pass it to the resource.
Signed-off-by: Devdeep Singh <devdeep@gmail.com>
2013-05-21 13:33:07 +05:30
Prasanna Santhanam 8da7ec05f1 CLOUDSTACK-2085: DMC enable guest scaling
When dmc is enabled allow cloudstack to scale the VM between dynamic
ranges. This requires a further commit where there is enough memory
available between dynamic-max and static-max for the VM to scale under
memory pressure. See the TODO in Xenserver56FP1Resource.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-20 17:51:49 +05:30
Prasanna Santhanam 85d54cd1c0 CLOUDSTACK-2554: Incorrect compute of minmemory and cpu
23e54bb0 introduced multiple hypervisors support for cpu and memory
overcommit. Here the HypervisorGuru base which determines the min, max
range for the memory for all hypervisors computes the minCpu using the
MemoryOverCommit ratio and minMemory using the CpuOverCommit ratio.

Minor typo/logic issue but massive damage across all HV if enabled ;)

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:27 +05:30
Prasanna Santhanam 7ea2c950f5 CLOUDSTACK-2554: Ensuring that we honor hypervisor xen's memory constraints
When setting memory constraints on Xen guests we should honor:
static-min <= dynamic-min <= dynamic-max <= static-max

Our VmSpec while allows the guests to like between dynamic-min and
dynamic-max the memory set by the resource set the static min to be
equal to the dynamic max. This restricts the hypervisor from ensuring
optimized memory handling of guests.

see: http://wiki.xen.org/wiki/XCP_FAQ_Dynamic_Memory_Control#How_does_XCP_choose_targets_for_guests_in_dynamic_range_mode.3F

Another fix was related the restrict_dmc option. when enabled (true)
this option disallows scaling a vm. The logic was reverse handled
allowing scaling when restrict_dmc was on. This control flow is now
fixed.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:27 +05:30
Prasanna Santhanam 806aeb990d CLOUDSTACK-2554: CloudStack fails to load XCP 1.6 hypervisors
Missing default constructor fails the agent manager reloading the XCP
resource on reboot of management server. This is fixed by using the
default constructor as do other Xen resources and include a new resource
ala XenServers for XCP1.6.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:26 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Harikrishna Patnala ca0d2ef8c2 CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 19:41:48 -07:00
Sheng Yang 2d2c0c48cd Merge branch 'pvlan'
Conflicts:
	scripts/vm/hypervisor/xenserver/xenserver60/patch
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/vpc/VpcManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/test/com/cloud/network/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2013-05-15 16:08:08 -07:00
Harikrishna Patnala ffe90c0059 CLOUDSTACK-2085: VM weight on xen remain same as before vmscaleup ;because "Add-To-VCPUs-Params-Live.sh" is not getting copied on xs host
Fixed by updating the patch files that has
 entries to copy scipts on xenserver. Here we added
 Add-To-VCPUs-Params-Live.sh

Added a check on Host params whether host restricts Dynamic memory control(DMC) to able to allow scale up VM.
If DMC is not enabled then static max and min are set to SO.

Signed Off by - Nitin Mehta <nitin.mehta@citrix.com>
2013-05-15 16:17:21 +05:30
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Edison Su 879a954b98 delete snapshot at the backend 2013-05-14 21:58:07 -07:00
Edison Su 68ffe1c706 fix bug in create volume from snapshot 2013-05-14 16:38:02 -07:00