mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-25 02:50:08 +03:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Hector Sanjuan
commit
7a078091d9
2
NOTICE
2
NOTICE
@ -1,7 +1,7 @@
|
||||
OpenNebula Open Source Project
|
||||
--------------------------------------------------------------------------------
|
||||
Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)
|
||||
Copyright 2010-2011, C12G Labs S.L. (C12G.com)
|
||||
Copyright 2010-2012, C12G Labs S.L. (C12G.com)
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
You can find more information about the project, release notes and
|
||||
|
||||
10
install.sh
10
install.sh
@ -302,6 +302,8 @@ SELF_SERVICE_DIRS="\
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/locale \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/en_US \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/es_ES \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/fr_FR \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/fr_CA \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/vendor \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/vendor/jQueryLayout \
|
||||
$LIB_LOCATION/ruby/cloud/occi/ui/public/vendor/dataTables \
|
||||
@ -528,6 +530,8 @@ INSTALL_SELF_SERVICE_FILES=(
|
||||
SELF_SERVICE_PUBLIC_IMAGES_FILES:$LIB_LOCATION/ruby/cloud/occi/ui/public/images
|
||||
SELF_SERVICE_PUBLIC_LOCALE_EN_US:$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/en_US
|
||||
SELF_SERVICE_PUBLIC_LOCALE_ES_ES:$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/es_ES
|
||||
SELF_SERVICE_PUBLIC_LOCALE_FR_FR:$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/fr_FR
|
||||
SELF_SERVICE_PUBLIC_LOCALE_FR_CA:$LIB_LOCATION/ruby/cloud/occi/ui/public/locale/fr_CA
|
||||
)
|
||||
|
||||
INSTALL_ETC_FILES=(
|
||||
@ -1431,7 +1435,11 @@ src/cloud/occi/lib/ui/public/images/yellow_bullet.png"
|
||||
|
||||
SELF_SERVICE_PUBLIC_LOCALE_EN_US="src/cloud/occi/lib/ui/public/locale/en_US/en_US.js"
|
||||
SELF_SERVICE_PUBLIC_LOCALE_ES_ES="src/cloud/occi/lib/ui/public/locale/es_ES/es_ES.js \
|
||||
src/cloud/occi/lib/ui/public/locale/es_ES/es_datatable.txt"
|
||||
src/cloud/occi/lib/ui/public/locale/es_ES/es_datatable.txt"
|
||||
SELF_SERVICE_PUBLIC_LOCALE_FR_FR="src/cloud/occi/lib/ui/public/locale/fr_FR/fr_FR.js \
|
||||
src/cloud/occi/lib/ui/public/locale/fr_FR/fr_datatable.txt"
|
||||
SELF_SERVICE_PUBLIC_LOCALE_FR_CA="src/cloud/occi/lib/ui/public/locale/fr_CA/fr_CA.js \
|
||||
src/cloud/occi/lib/ui/public/locale/fr_CA/fr_datatable.txt"
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
# ACCT files
|
||||
|
||||
33
share/doc/xsd/cluster.xsd
Normal file
33
share/doc/xsd/cluster.xsd
Normal file
@ -0,0 +1,33 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
|
||||
targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
|
||||
<xs:element name="CLUSTER">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer"/>
|
||||
<xs:element name="NAME" type="xs:string"/>
|
||||
<xs:element name="HOSTS">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="DATASTORES">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="VNETS">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
12
share/doc/xsd/cluster_pool.xsd
Normal file
12
share/doc/xsd/cluster_pool.xsd
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
|
||||
targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
|
||||
<xs:include schemaLocation="cluster.xsd"/>
|
||||
<xs:element name="CLUSTER_POOL">
|
||||
<xs:complexType>
|
||||
<xs:sequence maxOccurs="1" minOccurs="1">
|
||||
<xs:element ref="CLUSTER" maxOccurs="unbounded" minOccurs="0"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
44
share/doc/xsd/datastore.xsd
Normal file
44
share/doc/xsd/datastore.xsd
Normal file
@ -0,0 +1,44 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
|
||||
<xs:element name="DATASTORE">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer"/>
|
||||
<xs:element name="UID" type="xs:integer"/>
|
||||
<xs:element name="GID" type="xs:integer"/>
|
||||
<xs:element name="UNAME" type="xs:string"/>
|
||||
<xs:element name="GNAME" type="xs:string"/>
|
||||
<xs:element name="NAME" type="xs:string"/>
|
||||
<xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="OWNER_U" type="xs:integer"/>
|
||||
<xs:element name="OWNER_M" type="xs:integer"/>
|
||||
<xs:element name="OWNER_A" type="xs:integer"/>
|
||||
<xs:element name="GROUP_U" type="xs:integer"/>
|
||||
<xs:element name="GROUP_M" type="xs:integer"/>
|
||||
<xs:element name="GROUP_A" type="xs:integer"/>
|
||||
<xs:element name="OTHER_U" type="xs:integer"/>
|
||||
<xs:element name="OTHER_M" type="xs:integer"/>
|
||||
<xs:element name="OTHER_A" type="xs:integer"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
<xs:element name="DS_MAD" type="xs:string"/>
|
||||
<xs:element name="TM_MAD" type="xs:string"/>
|
||||
<xs:element name="BASE_PATH" type="xs:string"/>
|
||||
<xs:element name="CLUSTER_ID" type="xs:integer"/>
|
||||
<xs:element name="CLUSTER" type="xs:string"/>
|
||||
<xs:element name="IMAGES">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="TEMPLATE" type="xs:anyType"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
12
share/doc/xsd/datastore_pool.xsd
Normal file
12
share/doc/xsd/datastore_pool.xsd
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
|
||||
targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
|
||||
<xs:include schemaLocation="datastore.xsd"/>
|
||||
<xs:element name="DATASTORE_POOL">
|
||||
<xs:complexType>
|
||||
<xs:sequence maxOccurs="1" minOccurs="1">
|
||||
<xs:element ref="DATASTORE" maxOccurs="unbounded" minOccurs="0"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
</xs:schema>
|
||||
@ -9,8 +9,9 @@
|
||||
<xs:element name="IM_MAD" type="xs:string"/>
|
||||
<xs:element name="VM_MAD" type="xs:string"/>
|
||||
<xs:element name="VN_MAD" type="xs:string"/>
|
||||
<xs:element name="TM_MAD" type="xs:string"/>
|
||||
<xs:element name="LAST_MON_TIME" type="xs:integer"/>
|
||||
<xs:element name="CLUSTER_ID" type="xs:integer"/>
|
||||
<xs:element name="CLUSTER" type="xs:string"/>
|
||||
<xs:element name="HOST_SHARE">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
|
||||
@ -33,6 +33,8 @@
|
||||
<xs:element name="SIZE" type="xs:integer"/>
|
||||
<xs:element name="STATE" type="xs:integer"/>
|
||||
<xs:element name="RUNNING_VMS" type="xs:integer"/>
|
||||
<xs:element name="DATASTORE_ID" type="xs:integer"/>
|
||||
<xs:element name="DATASTORE" type="xs:string"/>
|
||||
<xs:element name="TEMPLATE" type="xs:anyType"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
|
||||
@ -1,5 +1,153 @@
|
||||
#!/bin/bash
|
||||
|
||||
for i in group_pool group host_pool host image_pool image template_pool template user_pool user vm_pool vm vnet_pool vnet
|
||||
# -------------------------------------------------------------------------- #
|
||||
# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) #
|
||||
# #
|
||||
# Licensed 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. #
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
mkdir -p samples/cluster samples/cluster_pool
|
||||
mkdir -p samples/datastore samples/datastore_pool
|
||||
mkdir -p samples/group samples/group_pool
|
||||
mkdir -p samples/host samples/host_pool
|
||||
mkdir -p samples/image samples/image_pool
|
||||
mkdir -p samples/vmtemplate samples/vmtemplate_pool
|
||||
mkdir -p samples/user samples/user_pool
|
||||
mkdir -p samples/vm samples/vm_pool
|
||||
mkdir -p samples/vnet samples/vnet_pool
|
||||
|
||||
|
||||
|
||||
onecluster create newcluster
|
||||
onegroup create newgroup
|
||||
|
||||
|
||||
# Host
|
||||
onehost create host01 --im im_test --vm vmm_test --net dummy
|
||||
onehost create host02 --im im_test --vm vmm_test --net dummy
|
||||
|
||||
onecluster addhost newcluster host02
|
||||
|
||||
onehost show 0 -x > samples/host/0.xml
|
||||
onehost show 1 -x > samples/host/1.xml
|
||||
|
||||
onehost list -x > samples/host_pool/0.xml
|
||||
|
||||
|
||||
# VNets
|
||||
onevnet list -x > samples/vnet_pool/1.xml
|
||||
|
||||
onevnet create test/vnet.0
|
||||
|
||||
onevnet list -x > samples/vnet_pool/2.xml
|
||||
|
||||
onevnet create test/vnet.1
|
||||
onevnet create test/vnet.2
|
||||
|
||||
onecluster addvnet newcluster 0
|
||||
onecluster addvnet newcluster 2
|
||||
|
||||
onevnet show 0 -x > samples/vnet/0.xml
|
||||
onevnet show 1 -x > samples/vnet/1.xml
|
||||
onevnet show 2 -x > samples/vnet/2.xml
|
||||
|
||||
onevnet list -x > samples/vnet_pool/3.xml
|
||||
|
||||
|
||||
# Template
|
||||
onetemplate list -x > samples/vmtemplate_pool/1.xml
|
||||
|
||||
onetemplate create test/template.0
|
||||
onetemplate create test/template.1
|
||||
|
||||
onetemplate show 0 -x > samples/vmtemplate/0.xml
|
||||
onetemplate show 1 -x > samples/vmtemplate/1.xml
|
||||
|
||||
onetemplate list -x > samples/vmtemplate_pool/2.xml
|
||||
|
||||
|
||||
# VM
|
||||
onetemplate instantiate 0
|
||||
|
||||
onevm show 0 -x > samples/vm/0.xml
|
||||
|
||||
onevm list -x > samples/vm_pool/0.xml
|
||||
|
||||
# Cluster
|
||||
onecluster create emptycluster
|
||||
|
||||
onecluster show 100 -x > samples/cluster/0.xml
|
||||
onecluster show 101 -x > samples/cluster/1.xml
|
||||
|
||||
onecluster list -x > samples/cluster_pool/0.xml
|
||||
|
||||
|
||||
# Image
|
||||
oneimage list -x > samples/image_pool/1.xml
|
||||
|
||||
oneimage create test/image.0 -d default
|
||||
oneimage create test/image.1 -d default
|
||||
|
||||
oneimage show 0 -x > samples/image/0.xml
|
||||
oneimage show 1 -x > samples/image/1.xml
|
||||
|
||||
oneimage list -x > samples/image_pool/3.xml
|
||||
|
||||
|
||||
# Datastore
|
||||
onedatastore create test/datastore.0
|
||||
onedatastore create test/datastore.1
|
||||
|
||||
onecluster adddatastore newcluster 100
|
||||
onecluster adddatastore newcluster 101
|
||||
|
||||
onedatastore show 100 -x > samples/datastore/0.xml
|
||||
onedatastore show 101 -x > samples/datastore/1.xml
|
||||
|
||||
onedatastore list -x > samples/datastore_pool/0.xml
|
||||
|
||||
|
||||
# User
|
||||
oneuser create newuser abc
|
||||
oneuser chgrp newuser newgroup
|
||||
|
||||
oneuser show newuser -x > samples/user/0.xml
|
||||
|
||||
oneuser list -x > samples/user_pool/0.xml
|
||||
|
||||
|
||||
# Group
|
||||
onegroup create emptygroup
|
||||
|
||||
onegroup show 0 -x > samples/group/0.xml
|
||||
onegroup show 1 -x > samples/group/1.xml
|
||||
onegroup show 100 -x > samples/group/2.xml
|
||||
onegroup show 101 -x > samples/group/3.xml
|
||||
|
||||
onegroup list -x > samples/group_pool/0.xml
|
||||
|
||||
|
||||
|
||||
for i in cluster datastore group host image vmtemplate user vm vnet
|
||||
do
|
||||
POOL_NAME="$i""_pool"
|
||||
|
||||
sed -i "s%<${i^^}>%<${i^^} xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$i.xsd'>%" samples/$i/*.xml
|
||||
sed -i "s%<${i^^}_POOL/>%<${i^^}_POOL xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$POOL_NAME.xsd'/>%" samples/$POOL_NAME/*.xml
|
||||
sed -i "s%<${i^^}_POOL>%<${i^^}_POOL xmlns='http://opennebula.org/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://opennebula.org/XMLSchema ../../$POOL_NAME.xsd'>%" samples/$POOL_NAME/*.xml
|
||||
|
||||
xmllint --noout --schema $i.xsd samples/$i/*
|
||||
done
|
||||
xmllint --noout --schema $POOL_NAME.xsd samples/$POOL_NAME/*
|
||||
done
|
||||
|
||||
exit 0
|
||||
|
||||
3
share/doc/xsd/test/datastore.0
Normal file
3
share/doc/xsd/test/datastore.0
Normal file
@ -0,0 +1,3 @@
|
||||
NAME = ds0
|
||||
DS_MAD = fs
|
||||
TM_MAD = shared
|
||||
5
share/doc/xsd/test/datastore.1
Normal file
5
share/doc/xsd/test/datastore.1
Normal file
@ -0,0 +1,5 @@
|
||||
NAME = ds1
|
||||
DS_MAD = fs
|
||||
TM_MAD = shared
|
||||
EXTRA = ABC
|
||||
EXTRA2 = 123
|
||||
4
share/doc/xsd/test/image.0
Normal file
4
share/doc/xsd/test/image.0
Normal file
@ -0,0 +1,4 @@
|
||||
NAME = "Ubuntu"
|
||||
PATH = /etc/hosts
|
||||
TYPE = OS
|
||||
DESCRIPTION = "Ubuntu 10.04 desktop for students."
|
||||
5
share/doc/xsd/test/image.1
Normal file
5
share/doc/xsd/test/image.1
Normal file
@ -0,0 +1,5 @@
|
||||
NAME = "Experiment results"
|
||||
TYPE = DATABLOCK
|
||||
SIZE = 10
|
||||
FSTYPE = ext3
|
||||
EXTRA = ABC
|
||||
5
share/doc/xsd/test/template.0
Normal file
5
share/doc/xsd/test/template.0
Normal file
@ -0,0 +1,5 @@
|
||||
NAME = template0
|
||||
MEMORY = 128
|
||||
CPU = 1
|
||||
EXTRA = ABC
|
||||
EXTRA2 = 123
|
||||
1
share/doc/xsd/test/template.1
Normal file
1
share/doc/xsd/test/template.1
Normal file
@ -0,0 +1 @@
|
||||
NAME = template1
|
||||
15
share/doc/xsd/test/vnet.0
Normal file
15
share/doc/xsd/test/vnet.0
Normal file
@ -0,0 +1,15 @@
|
||||
NAME = "Blue LAN"
|
||||
TYPE = FIXED
|
||||
|
||||
BRIDGE = vbr1
|
||||
|
||||
LEASES = [IP=130.10.0.1]
|
||||
LEASES = [IP=130.10.0.2, MAC=50:20:20:20:20:21]
|
||||
LEASES = [IP=130.10.0.3]
|
||||
LEASES = [IP=130.10.0.4]
|
||||
|
||||
# Custom Attributes to be used in Context
|
||||
GATEWAY = 130.10.0.1
|
||||
DNS = 130.10.0.1
|
||||
|
||||
LOAD_BALANCER = 130.10.0.4
|
||||
9
share/doc/xsd/test/vnet.1
Normal file
9
share/doc/xsd/test/vnet.1
Normal file
@ -0,0 +1,9 @@
|
||||
NAME = "R"
|
||||
TYPE = RANGED
|
||||
|
||||
BRIDGE = vbr1
|
||||
|
||||
NETWORK_ADDRESS = 10.10.10.0
|
||||
NETWORK_MASK = 255.255.255.0
|
||||
|
||||
CUSTOM = ABC
|
||||
4
share/doc/xsd/test/vnet.2
Normal file
4
share/doc/xsd/test/vnet.2
Normal file
@ -0,0 +1,4 @@
|
||||
NAME = "Empty"
|
||||
TYPE = FIXED
|
||||
|
||||
BRIDGE = vbr1
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
|
||||
targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
|
||||
<xs:include schemaLocation="template.xsd"/>
|
||||
<xs:include schemaLocation="vmtemplate.xsd"/>
|
||||
<xs:element name="VMTEMPLATE_POOL">
|
||||
<xs:complexType>
|
||||
<xs:sequence maxOccurs="1" minOccurs="1">
|
||||
@ -25,6 +25,8 @@
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
<xs:element name="CLUSTER_ID" type="xs:integer"/>
|
||||
<xs:element name="CLUSTER" type="xs:string"/>
|
||||
<xs:element name="TYPE" type="xs:integer"/>
|
||||
<xs:element name="BRIDGE" type="xs:string"/>
|
||||
<xs:element name="VLAN" type="xs:integer"/>
|
||||
|
||||
@ -43,7 +43,8 @@ DISTRIBUTIONS={
|
||||
'curb' => ['gcc', 'libcurl4-openssl-dev'],
|
||||
'nokogiri' => %w{gcc rake libxml2-dev libxslt1-dev},
|
||||
'xmlparser' => ['gcc', 'libexpat1-dev'],
|
||||
'thin' => ['g++']
|
||||
'thin' => ['g++'],
|
||||
'json' => ['make', 'gcc']
|
||||
},
|
||||
:install_command => 'apt-get install',
|
||||
:gem_env => {
|
||||
@ -58,7 +59,8 @@ DISTRIBUTIONS={
|
||||
'curb' => ['gcc', 'curl-devel'],
|
||||
'nokogiri' => %w{gcc rubygem-rake libxml2-devel libxslt-devel},
|
||||
'xmlparser' => ['gcc', 'expat-devel'],
|
||||
'thin' => ['gcc-c++']
|
||||
'thin' => ['gcc-c++'],
|
||||
'json' => ['make', 'gcc']
|
||||
},
|
||||
:install_command => 'yum install'
|
||||
},
|
||||
@ -70,7 +72,8 @@ DISTRIBUTIONS={
|
||||
'curb' => ['gcc', 'libcurl-devel'],
|
||||
'nokogiri' => %w{rubygem-rake gcc rubygem-rake libxml2-devel libxslt-devel},
|
||||
'xmlparser' => ['gcc', 'libexpat-devel'],
|
||||
'thin' => ['rubygem-rake', 'gcc-c++']
|
||||
'thin' => ['rubygem-rake', 'gcc-c++'],
|
||||
'json' => ['make', 'gcc']
|
||||
},
|
||||
:install_command => 'zypper install'
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# --------------------------------------------------------------------------
|
||||
# Copyright 2010-2011, C12G Labs S.L.
|
||||
# Copyright 2010-2012, C12G Labs S.L.
|
||||
#
|
||||
# This file is part of OpenNebula addons.
|
||||
#
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -76,7 +76,7 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
|
||||
d["TM_MAD"]
|
||||
end
|
||||
|
||||
default :ID, :CLUSTER, :NAME, :IMAGES, :TYPE, :TM_MAD
|
||||
default :ID, :CLUSTER, :NAME, :IMAGES, :TYPE, :TM
|
||||
end
|
||||
|
||||
table
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# --------------------------------------------------------------------------
|
||||
# Copyright 2010-2011, C12G Labs S.L.
|
||||
# Copyright 2010-2012, C12G Labs S.L.
|
||||
#
|
||||
# This file is part of OpenNebula addons.
|
||||
#
|
||||
|
||||
@ -30,6 +30,8 @@ var config_tab_content =
|
||||
<select id="lang_sel" style="width:20em;">\
|
||||
<option value="en_US">'+tr("English")+'</option>\
|
||||
<option value="es_ES">'+tr("Spanish")+'</option>\
|
||||
<option value="fr_FR">'+tr("French (FR)")+'</option>\
|
||||
<option value="fr_CA">'+tr("French (CA)")+'</option>\
|
||||
</select>\
|
||||
</td>\
|
||||
</tr>\
|
||||
|
||||
165
src/cloud/occi/lib/ui/public/locale/fr_CA/fr_CA.js
Normal file
165
src/cloud/occi/lib/ui/public/locale/fr_CA/fr_CA.js
Normal file
@ -0,0 +1,165 @@
|
||||
//Translated by Romain Dartigues <romain.dartigues@gmail.com>
|
||||
lang="fr_CA"
|
||||
datatable_lang="fr_datatable.txt"
|
||||
locale={
|
||||
"Additionally, OpenNebula Self-Service allows easy customization of the interface (e.g. this text) and brings multi-language support.":"Aditionnellement, OpenNebula Libre-Service permet une personalisation aisée de l'interface (ex.: ce texte) et apporte un support multilingue.",
|
||||
"Additionally, you can run several operations on defined storages, such as defining their persistance. Persistent images can only be used by 1 virtual machine, and the changes made by it have effect on the base image. Non-persistent images are cloned before being used in a Virtual Machine, therefore changes are lost unless a snapshot is taken prior to Virtual Machine shutdown.":"En outre, vous pouvez exécuter plusieurs opérations sur une image définie, tel que définir leur persistance. Les images persistantes peuvent seulement être utilisées par une machine virtuelle et les changements effectués auront un effet sur l'image de base. Les images non-persistantes sont clonées avant d'être utilisées dans une machine virtuelle, mais les changements sont perdus en moins qu'un instantané soit pris avant l'extinction de la machine virtuelle.",
|
||||
"Additionally, you can take a \'snapshot\' of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.":"De plus, vous pouvez prendre un \"instantané\" d\'une image raccordée à ces ressources. Elles seront sauvegardées en tant que nouvelles ressources, visibles depuis la vue \"Images\" et réutilisables.",
|
||||
"Address":"Adresse ",
|
||||
"Add storage":"Ajouter des images",
|
||||
"All":"Tout ",
|
||||
"are mandatory":"sont obligatoire",
|
||||
"Cancel":"Annuler",
|
||||
"Cannot contact server: is it running and reachable?":"Impossible de contacter le serveur: est-il en cours d'exécution et accessible ?",
|
||||
"Canvas not supported.":"Modèle non supporté.",
|
||||
"CD-ROM":"CD-ROM",
|
||||
"Changing language":"Modification de la langue",
|
||||
"Close":"Fermer",
|
||||
"Community":"Communauté",
|
||||
"Compute":"Machines virtuelles",
|
||||
"Compute resource":"Ressource de calcul",
|
||||
"Compute resources are Virtual Machines attached to storage and network resources. OpenNebula Self-Service allows you to easily create, remove and manage them, including the possibility of pausing a Virtual Machine or taking a snapshot of one of their disks.":"Les ressources de calculs sont des machines virtuelles attachées aux ressources de stockage et de réseau. OpenNebula Libre-Service vous permet d'aiséement les créer, supprimer et gérer, incluant la possibilité de mettre en pause une machine virtuelle ou de prendre un instantané d'un de leur disques.",
|
||||
"Compute resources can be attached to these networks at creation time. Virtual machines will be provided with an IP and the correct parameters to ensure connectivity.":"Les ressources de calculs peuvent être rattachées à ces réseaux lors de la création. Une adresse IP ainsi que les paramètres corrects afin d'assurer une connectivité seront fournis aux machines virtuelles.",
|
||||
"Configuration":"Configuration",
|
||||
"Confirmation of action":"Confirmation de l\'action",
|
||||
"CPU":"CPU",
|
||||
"Create":"Créer",
|
||||
"Create network":"Créer le réseau",
|
||||
"Create new compute resource":"Créer une nouvelle ressource de calcul",
|
||||
"Create new network resource":"Créer une nouvelle ressource réseau",
|
||||
"Create new storage resource":"Créer une nouvelle ressource de stockage",
|
||||
"Create Virtual Machine":"Créer une machine virtuelle",
|
||||
"Create # VMs":"Créer # MVs",
|
||||
"Current resources":"Ressources actuelles",
|
||||
"Dashboard":"Tableau de bord",
|
||||
"Datablock":"Block de données",
|
||||
"Delete":"Supprimer",
|
||||
"Description":"Description",
|
||||
"disk id":"identifiant disque",
|
||||
"Disks":"Disques",
|
||||
"Disks information":"Informations des disques",
|
||||
"Documentation":"Documentation",
|
||||
"Do you want to proceed?":"Souhaitez-vous continuer ?",
|
||||
"English":"Anglais",
|
||||
"Error":"Erreur",
|
||||
"Fields marked with":"Champs marqués par",
|
||||
"Filesystem type":"Type de système de fichiers",
|
||||
"FS type":"Type de FS",
|
||||
"French":"Français",
|
||||
"French Canadian":"Québécois",
|
||||
"Have a cloudy experience!":"Ayez une expérience dans le Nuage!",
|
||||
"Human readable description of the image.":"Description humainement lisible de l'image.",
|
||||
"ID":"ID",
|
||||
"Image":"Image",
|
||||
"Image information":"Information de l'image",
|
||||
"Image name":"Nom de l'image",
|
||||
"images":"images",
|
||||
"Images":"Images",
|
||||
"Info":"Info.",
|
||||
"information":"information",
|
||||
"Instance type":"Type d\'instance",
|
||||
"In this view you can easily manage OpenNebula Network resources. You can add or remove virtual networks.":"Dans cette vue vous pouvez aisément gérer les ressources Réseau d\'OpenNebula. Vous pouvez ajouter ou supprimer des réseaux virtuels.",
|
||||
"IP":"IP",
|
||||
"Language":"Langue",
|
||||
"Launch VNC session":"Exécuter une session VNC",
|
||||
"Loading":"Chargement",
|
||||
"Loading new language... please wait":"Chargement d\'une nouvelle langue... veuillez patienter",
|
||||
"MAC":"MAC",
|
||||
"Make non persistent":"Rendre non-persistant",
|
||||
"Make persistent":"Rendre persistant",
|
||||
"Memory":"Mémoire",
|
||||
"Monitoring information":"Information de surveillance",
|
||||
"Name":"Nom",
|
||||
"Name that the Image will get.":"Nom que l\'Image va avoir.",
|
||||
"Network":"Réseau",
|
||||
"Network Address":"Adresse réseau",
|
||||
"Network information":"Information réseau",
|
||||
"Network is unreachable: is OpenNebula running?":"Le réseau est injoignable: est-ce qu\'OpenNebula tourne ?",
|
||||
"Network reception":"Réception réseau",
|
||||
"networks":"réseaux",
|
||||
"Networks":"Réseaux",
|
||||
"Networks information":"Informations réseaux",
|
||||
"Network Size":"Taille du réseau",
|
||||
"Network transmission":"Transmission réseau",
|
||||
"+ New":"+ Nouveau",
|
||||
"No disk id or image name specified":"Aucun identifiant de disque ou nom d\'image",
|
||||
"No disks defined":"Aucun disque défini",
|
||||
"No networks defined":"Aucun réseau défini",
|
||||
"OK":"OK",
|
||||
"OpenNebula Self-Service is a simplified user interface to manage OpenNebula compute, storage and network resources. It is focused on easiness and usability and features a limited set of operations directed towards end-users.":"OpenNebula Libre-Service est une interface utilisateur simplifiée pour gérer les ressources de calcul, stockage et réseau OpenNebula. Il est axé sur la facilité et la convivialité d\'un nombre limité d\'opérations destinées aux utilisateurs finaux.",
|
||||
"Open VNC Session":"Ouvrir une session VNC",
|
||||
"OS":"OS",
|
||||
"Persistence of the image":"Persistance de l\'image",
|
||||
"Persistent":"Persistant",
|
||||
"Please, choose and modify the template you want to update":"Veuillez choisir et modifier le modèle que vous souhaitez mettre à jour",
|
||||
"Please provide a network address":"Veuillez renseigner une adresse réseau",
|
||||
"Please select":"Veuillez sélectionner",
|
||||
"Previous action":"Action précédente",
|
||||
"Public":"Publique",
|
||||
"Public scope of the image":"Visibilité publique de l\'image",
|
||||
"Publish":"Publier",
|
||||
"Refresh list":"Rafraîchir la liste",
|
||||
"Resume":"Reprendre",
|
||||
"Retrieving":"Récupération",
|
||||
"Saveas for VM with ID":"Sauvegarder sous pour une MV avec ID",
|
||||
"See more":"Voir plus",
|
||||
"Select a template":"Sélectionner un modèle",
|
||||
"Select disk":"Sélectionner un disque",
|
||||
"Select image to upload":"Sélectionner une image à téléverser",
|
||||
"Self-Service UI Configuration":"Configuration de l\'interface utilisateur du Libre-Service",
|
||||
"Shutdown":"Éteindre",
|
||||
"Sign out":"Déconnecter",
|
||||
"Size":"Taille",
|
||||
"Size (Mb)":"Taille (Mb)",
|
||||
"Size of the datablock in MB.":"Taille du bloc de données en MB.",
|
||||
"Skipping VM ":"Passer la MV",
|
||||
"Spanish":"Espagnol",
|
||||
"State":"État",
|
||||
"Stop":"Arrêter",
|
||||
"Storage":"Stockage",
|
||||
"Storage pool is formed by several images. These images can contain from full operating systems to be used as base for compute resources, to simple data. OpenNebula Self-Service offers you the possibility to create or upload your own images.":"Le dépot de stockage est formé par plusieurs images. Ces images peuvent contenir du système d\'exploitation complet pour être utilisé comme base pour les ressources de calculs, à de simple données. Open-Nebula Libre-Service vous offre la possibilité de créer ou de téléverser vos propres images.",
|
||||
"String":"Chaîne",
|
||||
"style":"style",
|
||||
"Submitted":"Soumis",
|
||||
"Support":"Support",
|
||||
"Suspend":"Suspendre",
|
||||
"Take snapshot":"Prendre un instantané",
|
||||
"Target":"Cible",
|
||||
"There are currently":"Il y a présentement",
|
||||
"The Storage view offers you an overview of your current images. Storage elements are attached to compute resources at creation time. They can also be extracted from running virtual machines by taking an snapshot.":"La vue de stockage vous offre un aperçu de vos images actuelles. Les éléments de stockage sont attachés aux ressources de calculs lors de la création. Ils peuvent également être extrait d\'une machine virtuelle en cours d\'exécution en prenant un instantané.",
|
||||
"This is a list of your current compute resources. Virtual Machines use previously defined images and networks. You can easily create a new compute element by cliking \'new\' and filling-in an easy wizard.":"Ceci est une liste de vos ressources de calculs actuelles. Les machines virtuelles utilisent des images et réseaux prédéfinis. Vous pouvez facilement créer un nouvel élément de calcul en cliquant sur \"Nouveau\" et en remplissant un assistant.",
|
||||
"This will cancel selected VMs":"Ceci va annuler les MVs sélectionnées",
|
||||
"This will delete the selected VMs from the database":"Ceci va supprimer les MVs sélectionnées de la base de données",
|
||||
"This will resume the selected VMs in stopped or suspended states":"Ceci va reprendre les MVs sélectionnées qui sont stoppées ou en pause",
|
||||
"This will shutdown the selected VMs":"Ceci va éteindre les MVs sélectionnées",
|
||||
"This will suspend the selected VMs":"Ceci va mettre en pause les MVs sélectionnées",
|
||||
"Type":"Type",
|
||||
"Type of file system to be built. This can be any value understood by mkfs unix command.":"Type de système de fichier à créer. Ce peut être n\'importe quelle valeur comprise par la commande unix mkfs.",
|
||||
"Type of the image":"Type de l\'image",
|
||||
"Unauthorized":"Non autorisé",
|
||||
"Unpublish":"Retirer",
|
||||
"Update":"Mettre à jour",
|
||||
"Update template":"Mettre à jour le modèle",
|
||||
"Used leases":"Baux utilisés",
|
||||
"Useful links":"Liens utiles",
|
||||
"Virtual Machine information":"Informations sur la machine virtuelle",
|
||||
"virtual machines":"machines virtuelles",
|
||||
"Virtual Network":"Réseau Virtuel",
|
||||
"Virtual Network information":"Informations sur le Réseau Virtuel",
|
||||
"Virtual Network name missing!":"Le nom du Réseau Virtuel est manquant!",
|
||||
"VM information":"Information MV",
|
||||
"VM Name":"Nom MV",
|
||||
"VNC connection":"Connexion VNC",
|
||||
"VNC Disabled":"VNC désactivé",
|
||||
"Welcome":"Bienvenue",
|
||||
"Welcome to OpenNebula Self-Service":"Bienvenue au Libre-Service OpenNebula",
|
||||
"You can add new storages by clicking \'new\'. Image files will be uploaded to OpenNebula and set ready to be used.":"Vous pouvez ajouter de nouveaux stockages en cliquant sur \"Nouveau\". Les fichiers image seront téléversés à OpenNebula et prêts à être utilisés.",
|
||||
"You can also manage compute resources and perform actions such as stop, resume, shutdown or cancel.":"Vous pouvez aussi gérer les ressources de calculs et exécuter des actions telles qu'arrêter, reprendre, éteindre ou annuler.",
|
||||
"You can use the wildcard %i. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them":"Vous pouvez utiliser le joker %i. Lors de la création de plusieurs MVs, %i sera remplacé par un nombre commençant à 0 dans chaqu\'une d\'entre elles.",
|
||||
"You have to confirm this action.":"Vous devez confirmer cette action.",
|
||||
"You must select a file to upload":"Vous devez sélectionner un fichier à téléverser",
|
||||
"You must specify a name":"Vous devez spécifier un nom",
|
||||
"You must specify size and FS type":"Vous devez spécifier une taille et un type de Système de Fichiers",
|
||||
"You need to select something.":"Vous devez sélectionner quelque chose.",
|
||||
"Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.":"Votre connectivité de ressources de calculs est effectuée des réseaux virtuels pré-définis. Vous pouvez créer et gérer ces réseaux en utilisant OpenNebula Libre-Service",
|
||||
};
|
||||
17
src/cloud/occi/lib/ui/public/locale/fr_CA/fr_datatable.txt
Normal file
17
src/cloud/occi/lib/ui/public/locale/fr_CA/fr_datatable.txt
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"sProcessing": "En cours...",
|
||||
"sLengthMenu": "Affiche _MENU_ éléments",
|
||||
"sZeroRecords": "Pas d'enregistrement",
|
||||
"sInfo": "Affiche de _START_ à _END_ sur _TOTAL_",
|
||||
"sInfoEmpty": "Pas d'enregistrement",
|
||||
"sInfoFiltered": "(filtré sur un total de _MAX_)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "Rechercher:",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Premier",
|
||||
"sPrevious": "Précédent",
|
||||
"sNext": "Suivant",
|
||||
"sLast": "Dernier"
|
||||
}
|
||||
}
|
||||
165
src/cloud/occi/lib/ui/public/locale/fr_FR/fr_FR.js
Normal file
165
src/cloud/occi/lib/ui/public/locale/fr_FR/fr_FR.js
Normal file
@ -0,0 +1,165 @@
|
||||
//Translated by Romain Dartigues <romain.dartigues@gmail.com>
|
||||
lang="fr_FR"
|
||||
datatable_lang="fr_datatable.txt"
|
||||
locale={
|
||||
"Additionally, OpenNebula Self-Service allows easy customization of the interface (e.g. this text) and brings multi-language support.":"Aditionnellement, OpenNebula Self-Service permet une personalisation aisée de l'interface (ex.: ce texte) et apporte un support multi-lingue.",
|
||||
"Additionally, you can run several operations on defined storages, such as defining their persistance. Persistent images can only be used by 1 virtual machine, and the changes made by it have effect on the base image. Non-persistent images are cloned before being used in a Virtual Machine, therefore changes are lost unless a snapshot is taken prior to Virtual Machine shutdown.":"En outre, vous pouvez exécuter plusieurs opérations sur une image donnée, tel que définir sa persistance. Les images persistantes peuvent seulement être utilisées par une machine virtuelle et les changements effectués auront un effet sur l'image de base. Les images non-persistantes sont clonées avant d'être utilisées dans une machine virtuelle, mais les changements sont perdus à moins qu'un snapshot soit pris avant l'extinction de la machine virtuelle.",
|
||||
"Additionally, you can take a \'snapshot\' of the storage attached to these resources. They will be saved as new resources, visible from the Storage view and re-usable.":"De plus, vous pouvez prendre un « snapshot » des images attachées à ces ressources. Elles seront sauvegardées en tant que nouvelles images, visibles depuis l\'onglet « Disques » et réutilisables.",
|
||||
"Address":"Adresse IP",
|
||||
"Add storage":"Ajouter du stockage ",
|
||||
"All":"Tout ",
|
||||
"are mandatory":"sont obligatoire",
|
||||
"Cancel":"Annuler",
|
||||
"Cannot contact server: is it running and reachable?":"Impossible de contacter le serveur : est-il en cours d'exécution et accessible ?",
|
||||
"Canvas not supported.":"Canvas non supporté",
|
||||
"CD-ROM":"CD-ROM",
|
||||
"Changing language":"Modification de la langue",
|
||||
"Close":"Fermer",
|
||||
"Community":"Communauté",
|
||||
"Compute":"Machines virtuelles",
|
||||
"Compute resource":"Ressource de calcul",
|
||||
"Compute resources are Virtual Machines attached to storage and network resources. OpenNebula Self-Service allows you to easily create, remove and manage them, including the possibility of pausing a Virtual Machine or taking a snapshot of one of their disks.":"Les ressources de calculs sont des machines virtuelles attachées aux ressources de stockage et de réseau. OpenNebula Self-Service vous permet d'aiséement les créer, supprimer et gérer, incluant la possibilité de mettre en pause une machine virtuelle ou de prendre un snapshot d'un de leur disques.",
|
||||
"Compute resources can be attached to these networks at creation time. Virtual machines will be provided with an IP and the correct parameters to ensure connectivity.":"Les machines virtuelles peuvent être rattachées à ces réseaux lors de la création. Une adresse IP ainsi que les paramètres corrects afin d'assurer une connectivité seront fournis aux machines virtuelles.",
|
||||
"Configuration":"Configuration",
|
||||
"Confirmation of action":"Confirmation de l\'action",
|
||||
"CPU":"CPU",
|
||||
"Create":"Créer",
|
||||
"Create network":"Créer le réseau",
|
||||
"Create new compute resource":"Créer une nouvelle machine virtuelle",
|
||||
"Create new network resource":"Créer un nouveau réseau",
|
||||
"Create new storage resource":"Créer une nouvelle image",
|
||||
"Create Virtual Machine":"Créer une machine virtuelle",
|
||||
"Create # VMs":"Créer # VMs",
|
||||
"Current resources":"Ressources actuelles",
|
||||
"Dashboard":"Tableau de bord",
|
||||
"Datablock":"Block de données",
|
||||
"Delete":"Supprimer",
|
||||
"Description":"Description",
|
||||
"disk id":"identifiant disque",
|
||||
"Disks":"Disques",
|
||||
"Disks information":"Informations des disques",
|
||||
"Documentation":"Documentation",
|
||||
"Do you want to proceed?":"Souhaitez-vous continuer ?",
|
||||
"English":"Anglais",
|
||||
"Error":"Erreur",
|
||||
"Fields marked with":"Champs marqués par",
|
||||
"Filesystem type":"Type de système de fichiers",
|
||||
"French":"Français",
|
||||
"French Canadian":"Québécois",
|
||||
"FS type":"Type de FS",
|
||||
"Have a cloudy experience!":"Ayez une expérience dans le Cloud !",
|
||||
"Human readable description of the image.":"Description humainement lisible de l'image.",
|
||||
"ID":"ID",
|
||||
"Image":"Image",
|
||||
"Image information":"Information de l'image",
|
||||
"Image name":"Nom de l'image",
|
||||
"images":"images",
|
||||
"Images":"Images",
|
||||
"Info":"Info.",
|
||||
"information":"information",
|
||||
"Instance type":"Type d\'instance",
|
||||
"In this view you can easily manage OpenNebula Network resources. You can add or remove virtual networks.":"Dans cette vue vous pouvez aisément gérer les réseaux d\'OpenNebula. Vous pouvez ajouter ou supprimer des réseaux virtuels.",
|
||||
"IP":"IP",
|
||||
"Language":"Langue",
|
||||
"Launch VNC session":"Exécuter une session VNC",
|
||||
"Loading":"Chargement",
|
||||
"Loading new language... please wait":"Chargement d\'une nouvelle langue... veuillez patienter",
|
||||
"MAC":"MAC",
|
||||
"Make non persistent":"Rendre non-persistant",
|
||||
"Make persistent":"Rendre persistant",
|
||||
"Memory":"Mémoire",
|
||||
"Monitoring information":"Information de surveillance",
|
||||
"Name":"Nom",
|
||||
"Name that the Image will get.":"Nom que l\'Image va avoir.",
|
||||
"Network":"Réseau",
|
||||
"Network Address":"Adresse réseau",
|
||||
"Network information":"Information réseau",
|
||||
"Network is unreachable: is OpenNebula running?":"Le réseau est injoignable : est-ce qu\'OpenNebula tourne ?",
|
||||
"Network reception":"Réception réseau",
|
||||
"networks":"réseaux",
|
||||
"Networks":"Réseaux",
|
||||
"Networks information":"Informations réseaux",
|
||||
"Network Size":"Taille du réseau",
|
||||
"Network transmission":"Transmission réseau",
|
||||
"+ New":"+ Nouveau",
|
||||
"No disk id or image name specified":"Aucun identifiant de disque ou nom d\'image",
|
||||
"No disks defined":"Aucun disque défini",
|
||||
"No networks defined":"Aucun réseau défini",
|
||||
"OK":"OK",
|
||||
"OpenNebula Self-Service is a simplified user interface to manage OpenNebula compute, storage and network resources. It is focused on easiness and usability and features a limited set of operations directed towards end-users.":"OpenNebula Self-Service est une interface utilisateur simplifiée pour gérer les machines virtuelles, les images disques et les réseaux d'OpenNebula. Il est axé sur la facilité et la convivialité d\'un nombre limité d\'opérations destinées aux utilisateurs finaux.",
|
||||
"Open VNC Session":"Ouvrir une session VNC",
|
||||
"OS":"OS",
|
||||
"Persistence of the image":"Persistance de l\'image",
|
||||
"Persistent":"Persistant",
|
||||
"Please, choose and modify the template you want to update":"Veuillez choisir et modifier le modèle que vous souhaitez mettre à jour",
|
||||
"Please provide a network address":"Veuillez renseigner une adresse réseau",
|
||||
"Please select":"Veuillez sélectionner",
|
||||
"Previous action":"Action précédente",
|
||||
"Public":"Publique",
|
||||
"Public scope of the image":"Visibilité publique de l\'image",
|
||||
"Publish":"Publier",
|
||||
"Refresh list":"Rafraîchir la liste",
|
||||
"Resume":"Reprendre",
|
||||
"Retrieving":"Récupération",
|
||||
"Saveas for VM with ID":"Sauvegarder sous pour une VM avec ID",
|
||||
"See more":"Voir plus",
|
||||
"Select a template":"Sélectionner un modèle",
|
||||
"Select disk":"Sélectionner un disque",
|
||||
"Select image to upload":"Sélectionner une image à envoyer",
|
||||
"Self-Service UI Configuration":"Configuration de l\'interface de Self-Service",
|
||||
"Shutdown":"Éteindre",
|
||||
"Sign out":"Déconnecter",
|
||||
"Size":"Taille",
|
||||
"Size (Mb)":"Taille (Mb)",
|
||||
"Size of the datablock in MB.":"Taille du bloc de données en Mo.",
|
||||
"Skipping VM ":"Passer la VM",
|
||||
"Spanish":"Espagnol",
|
||||
"State":"État",
|
||||
"Stop":"Stop",
|
||||
"Storage":"Disques",
|
||||
"Storage pool is formed by several images. These images can contain from full operating systems to be used as base for compute resources, to simple data. OpenNebula Self-Service offers you the possibility to create or upload your own images.":"Le dépot de stockage est formé par plusieurs images disques. Ces images peuvent contenir un système d\'exploitation complet pour être utilisé comme base pour les machines virtuelles, ou de simples données. Open-Nebula Self-Service vous offre la possibilité de créer ou d\'envoyer vos propres images.",
|
||||
"String":"Chaîne",
|
||||
"style":"style",
|
||||
"Submitted":"Soumis",
|
||||
"Support":"Support",
|
||||
"Suspend":"Suspendre",
|
||||
"Take snapshot":"Prendre un snapshot",
|
||||
"Target":"Cible",
|
||||
"There are currently":"Il y a actuellement",
|
||||
"The Storage view offers you an overview of your current images. Storage elements are attached to compute resources at creation time. They can also be extracted from running virtual machines by taking an snapshot.":"L\'onglet Disques vous offre un aperçu de vos images disques actuelles. Les images sont attachées aux machines virtuelles lors de la création. Elles peuvent également être sauvegardées en prenant un snapshot.",
|
||||
"This is a list of your current compute resources. Virtual Machines use previously defined images and networks. You can easily create a new compute element by cliking \'new\' and filling-in an easy wizard.":"Ceci est la liste de vos machines virtuelles actuelles. Ces machines virtuelles utilisent des images et réseaux prédéfinis. Vous pouvez facilement créer une nouvelle machine virtuelle en cliquant sur « nouveau » et en remplissant le formulaire.",
|
||||
"This will cancel selected VMs":"Ceci va annuler les VMs sélectionnées",
|
||||
"This will delete the selected VMs from the database":"Ceci va supprimer les VMs sélectionnées de la base de données",
|
||||
"This will resume the selected VMs in stopped or suspended states":"Ceci va reprendre les VMs sélectionnées qui sont stoppées ou en pause",
|
||||
"This will shutdown the selected VMs":"Ceci va éteindre les VMs sélectionnées",
|
||||
"This will suspend the selected VMs":"Ceci va mettre en pause les VMs sélectionnées",
|
||||
"Type":"Type",
|
||||
"Type of file system to be built. This can be any value understood by mkfs unix command.":"Type de système de fichier à créer. Ce peut être n\'importe quelle valeur comprise par la commande unix mkfs.",
|
||||
"Type of the image":"Type de l\'image",
|
||||
"Unauthorized":"Non autorisé",
|
||||
"Unpublish":"Retirer",
|
||||
"Update":"Mettre à jour",
|
||||
"Update template":"Mettre à jour le modèle",
|
||||
"Used leases":"IP utilisées",
|
||||
"Useful links":"Liens utiles",
|
||||
"Virtual Machine information":"Informations sur la machine virtuelle",
|
||||
"virtual machines":"machines virtuelles",
|
||||
"Virtual Network":"Réseau Virtuel",
|
||||
"Virtual Network information":"Informations sur le Réseau Virtuel",
|
||||
"Virtual Network name missing!":"Le nom du Réseau Virtuel est manquant !",
|
||||
"VM information":"Information VM",
|
||||
"VM Name":"Nom VM",
|
||||
"VNC connection":"Connexion VNC",
|
||||
"VNC Disabled":"VNC désactivé",
|
||||
"Welcome":"Bienvenue",
|
||||
"Welcome to OpenNebula Self-Service":"Bienvenue dans OpenNebula Self-Service",
|
||||
"You can add new storages by clicking \'new\'. Image files will be uploaded to OpenNebula and set ready to be used.":"Vous pouvez ajouter de nouvelles images en cliquant sur « nouveau ». Les fichiers image seront envoyés à OpenNebula et prêts à être utilisés.",
|
||||
"You can also manage compute resources and perform actions such as stop, resume, shutdown or cancel.":"Vous pouvez aussi gérer les machines virtuelles et exécuter des actions telles que arrêter, reprendre, éteindre ou annuler.",
|
||||
"You can use the wildcard %i. When creating several VMs, %i will be replaced with a different number starting from 0 in each of them":"Vous pouvez utiliser le joker %i. Lors de la création de plusieurs VMs, %i sera remplacé par un nombre commençant à 0 dans chaqu\'une d\'entre elles.",
|
||||
"You have to confirm this action.":"Vous devez confirmer cette action.",
|
||||
"You must select a file to upload":"Vous devez sélectionner un fichier à envoyer",
|
||||
"You must specify a name":"Vous devez spécifier un nom",
|
||||
"You must specify size and FS type":"Vous devez spécifier une taille et un type de FS",
|
||||
"You need to select something.":"Vous devez sélectionner quelque chose.",
|
||||
"Your compute resources connectivity is performed using pre-defined virtual networks. You can create and manage these networks using OpenNebula Self-Service.":"La connectivité des machines virtuelles est effectuée par des réseaux virtuels pré-définis. Vous pouvez créer et gérer ces réseaux en utilisant OpenNebula Self-Service",
|
||||
};
|
||||
17
src/cloud/occi/lib/ui/public/locale/fr_FR/fr_datatable.txt
Normal file
17
src/cloud/occi/lib/ui/public/locale/fr_FR/fr_datatable.txt
Normal file
@ -0,0 +1,17 @@
|
||||
{
|
||||
"sProcessing": "En cours...",
|
||||
"sLengthMenu": "Affiche _MENU_ éléments",
|
||||
"sZeroRecords": "Pas d'enregistrement",
|
||||
"sInfo": "Affiche de _START_ à _END_ sur _TOTAL_",
|
||||
"sInfoEmpty": "Pas d'enregistrement",
|
||||
"sInfoFiltered": "(filtré sur un total de _MAX_)",
|
||||
"sInfoPostFix": "",
|
||||
"sSearch": "Rechercher:",
|
||||
"sUrl": "",
|
||||
"oPaginate": {
|
||||
"sFirst": "Premier",
|
||||
"sPrevious": "Précédent",
|
||||
"sNext": "Suivant",
|
||||
"sLast": "Dernier"
|
||||
}
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -18,10 +18,6 @@ require "CommandManager"
|
||||
require 'base64'
|
||||
require 'rexml/document'
|
||||
|
||||
# Author:: dsa-research.org
|
||||
# Copyright:: (c) 2011 Universidad Computense de Madrid
|
||||
# License:: Apache License
|
||||
|
||||
# This class provides basic messaging and logging functionality
|
||||
# to implement OpenNebula Drivers. A driver is a program that
|
||||
# specialize the OpenNebula behavior by interfacing with specific
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/* -------------------------------------------------------------------------- */
|
||||
/* Copyright 2010-2011, C12G Labs S.L. */
|
||||
/* Copyright 2010-2012, C12G Labs S.L. */
|
||||
/* */
|
||||
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
|
||||
/* not use this file except in compliance with the License. You may obtain */
|
||||
@ -14,7 +14,11 @@
|
||||
/* limitations under the License. */
|
||||
/* -------------------------------------------------------------------------- */
|
||||
|
||||
#ifdef __APPLE__
|
||||
#include <util.h>
|
||||
#else
|
||||
#include <pty.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -29,6 +29,7 @@ else
|
||||
OZONES_SERVER=$OZONES_LOCATION/ozones-server.rb
|
||||
OZONES_LOCK_FILE=$ONE_LOCATION/var/.ozones.lock
|
||||
OZONES_LOG=$ONE_LOCATION/var/ozones-server.log
|
||||
OZONES_LOG_ERROR=$ONE_LOCATION/var/ozones-server.error
|
||||
OZONES_CONF=$ONE_LOCATION/etc/ozones-server.conf
|
||||
fi
|
||||
|
||||
@ -60,7 +61,7 @@ start()
|
||||
|
||||
# Start the ozones daemon
|
||||
touch $OZONES_LOCK_FILE
|
||||
ruby $OZONES_SERVER > $OZONES_LOG 2>&1 &
|
||||
ruby $OZONES_SERVER > $OZONES_LOG 2>$OZONES_LOG_ERROR &
|
||||
LASTPID=$!
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error executing $OZONES_SERVER, please check the log $OZONES_LOG"
|
||||
|
||||
@ -28,6 +28,7 @@ else
|
||||
SUNSTONE_SERVER=$ONE_LOCATION/lib/sunstone/sunstone-server.rb
|
||||
SUNSTONE_LOCK_FILE=$ONE_LOCATION/var/.sunstone.lock
|
||||
SUNSTONE_LOG=$ONE_LOCATION/var/sunstone.log
|
||||
SUNSTONE_LOG_ERROR=$ONE_LOCATION/var/sunstone.error
|
||||
SUNSTONE_CONF=$ONE_LOCATION/etc/sunstone-server.conf
|
||||
fi
|
||||
|
||||
@ -59,7 +60,7 @@ start()
|
||||
|
||||
# Start the sunstone daemon
|
||||
touch $SUNSTONE_LOCK_FILE
|
||||
ruby $SUNSTONE_SERVER > $SUNSTONE_LOG 2>&1 &
|
||||
ruby $SUNSTONE_SERVER > $SUNSTONE_LOG 2>$SUNSTONE_LOG_ERROR &
|
||||
LASTPID=$!
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "Error executing $SUNSTONE_SERVER, please check the log $SUNSTONE_LOG"
|
||||
|
||||
@ -265,7 +265,7 @@ class SunstoneServer < CloudServer
|
||||
end
|
||||
|
||||
filter = {}
|
||||
filter[:uid] = opts[:uid] if opts[:gid]!="0"
|
||||
filter[:uid] = opts[:uid] if opts[:gid]!=0
|
||||
|
||||
columns = monitor_resources.split(',')
|
||||
columns.map!{|e| e.to_sym}
|
||||
|
||||
@ -64,7 +64,7 @@ var create_image_tmpl =
|
||||
<div class="tip">'+tr("Human readable description of the image for other users.")+'</div>\
|
||||
</div>\
|
||||
<div class="img_param">\
|
||||
<label for="img_type">'+tr("Datastore")+':</label>\
|
||||
<label for="img_datastore">'+tr("Datastore")+':</label>\
|
||||
<select id="img_datastore" name="img_datastore">\
|
||||
</select>\
|
||||
<div class="tip">'+tr("Select the datastore for this image")+'</div>\
|
||||
@ -175,8 +175,10 @@ var create_image_tmpl =
|
||||
<form id="create_image_form_manual" action="">\
|
||||
<fieldset style="border-top:none;">\
|
||||
<h3 style="margin-bottom:10px;">'+tr("Write the image template here")+'</h3>\
|
||||
<textarea id="template" rows="15" style="width:100%;">\
|
||||
</textarea>\
|
||||
<label for="img_datastores_raw">'+tr("Datastore")+':</label>\
|
||||
<select id="img_datastore_raw" name="img_datastore_raw">\
|
||||
</select>\
|
||||
<textarea id="template" rows="15" style="width:100%;"></textarea>\
|
||||
</fieldset>\
|
||||
<fieldset>\
|
||||
<div class="form_buttons">\
|
||||
@ -935,7 +937,20 @@ function setupCreateImageDialog(){
|
||||
|
||||
$('#create_image_form_manual',dialog).submit(function(){
|
||||
var template=$('#template',this).val();
|
||||
Sunstone.runAction("Image.create",template);
|
||||
var ds_id = $('#img_datastore_raw',this).val();
|
||||
|
||||
if (!ds_id){
|
||||
notifyError(tr("Please select a datastore for this image"));
|
||||
return false;
|
||||
};
|
||||
|
||||
var img_obj = {
|
||||
"image" : {
|
||||
"image_raw" : template
|
||||
},
|
||||
"ds_id" : ds_id,
|
||||
};
|
||||
Sunstone.runAction("Image.create",img_obj);
|
||||
$create_image_dialog.dialog('close');
|
||||
return false;
|
||||
});
|
||||
@ -946,6 +961,7 @@ function popUpCreateImageDialog(){
|
||||
$('#file-uploader input',$create_image_dialog).attr('style','margin:0;width:256px!important');
|
||||
|
||||
$('#img_datastore',$create_image_dialog).html(datastores_sel());
|
||||
$('#img_datastore_raw',$create_image_dialog).html(datastores_sel());
|
||||
|
||||
$create_image_dialog.dialog('open');
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env ruby
|
||||
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# ---------------------------------------------------------------------------- #
|
||||
# Copyright 2010-2011, C12G Labs S.L #
|
||||
# Copyright 2010-2012, C12G Labs S.L #
|
||||
# #
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may #
|
||||
# not use this file except in compliance with the License. You may obtain #
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user