mirror of
https://github.com/apache/cloudstack.git
synced 2025-12-16 10:32:34 +01:00
Merge branch '4.20' into fenchCheck
This commit is contained in:
dahn
GitHub
commit
a6c20f47b8
@ -51,14 +51,15 @@ github:
|
|||||||
|
|
||||||
collaborators:
|
collaborators:
|
||||||
- acs-robot
|
- acs-robot
|
||||||
- kiranchavala
|
|
||||||
- rajujith
|
- rajujith
|
||||||
- alexandremattioli
|
|
||||||
- vishesh92
|
|
||||||
- GaOrtiga
|
- GaOrtiga
|
||||||
- SadiJr
|
- SadiJr
|
||||||
- winterhazel
|
- winterhazel
|
||||||
- rp-
|
- gpordeus
|
||||||
|
- hsato03
|
||||||
|
- bernardodemarco
|
||||||
|
- abh1sar
|
||||||
|
- FelipeM525
|
||||||
|
|
||||||
protected_branches: ~
|
protected_branches: ~
|
||||||
|
|
||||||
|
|||||||
5
.github/linters/.flake8
vendored
5
.github/linters/.flake8
vendored
@ -22,8 +22,11 @@
|
|||||||
# E224 Tab after operator
|
# E224 Tab after operator
|
||||||
# E227 Missing whitespace around bitwise or shift operator
|
# E227 Missing whitespace around bitwise or shift operator
|
||||||
# E242 Tab after ','
|
# E242 Tab after ','
|
||||||
|
# E271 Multiple spaces after keyword
|
||||||
|
# E272 Multiple spaces before keyword
|
||||||
# E273 Tab after keyword
|
# E273 Tab after keyword
|
||||||
# E274 Tab before keyword
|
# E274 Tab before keyword
|
||||||
|
# E713 Test for membership should be 'not in'
|
||||||
# E742 Do not define classes named 'I', 'O', or 'l'
|
# E742 Do not define classes named 'I', 'O', or 'l'
|
||||||
# E743 Do not define functions named 'I', 'O', or 'l'
|
# E743 Do not define functions named 'I', 'O', or 'l'
|
||||||
# E901 SyntaxError or IndentationError
|
# E901 SyntaxError or IndentationError
|
||||||
@ -37,4 +40,4 @@
|
|||||||
exclude =
|
exclude =
|
||||||
.git,
|
.git,
|
||||||
venv
|
venv
|
||||||
select = E112,E113,E133,E223,E224,E227,E242,E273,E274,E742,E743,E901,E902,W291,W292,W293,W391
|
select = E112,E113,E133,E223,E224,E227,E242,E271,E272,E273,E274,E713,E742,E743,E901,E902,W291,W292,W293,W391
|
||||||
|
|||||||
100
.github/linters/.markdown-lint.yml
vendored
Normal file
100
.github/linters/.markdown-lint.yml
vendored
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
# Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
# or more contributor license agreements. See the NOTICE file
|
||||||
|
# distributed with this work for additional information
|
||||||
|
# regarding copyright ownership. The ASF licenses this file
|
||||||
|
# to you under the Apache License, Version 2.0 (the
|
||||||
|
# "License"); you may not use this file except in compliance
|
||||||
|
# with the License. You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing,
|
||||||
|
# software distributed under the License is distributed on an
|
||||||
|
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
# KIND, either express or implied. See the License for the
|
||||||
|
# specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
# MD001/heading-increment Heading levels should only increment by one level at a time
|
||||||
|
MD001: false
|
||||||
|
|
||||||
|
# MD003/heading-style Heading style
|
||||||
|
MD003: false
|
||||||
|
|
||||||
|
# MD004/ul-style Unordered list style
|
||||||
|
MD004: false
|
||||||
|
|
||||||
|
# MD007/ul-indent Unordered list indentation
|
||||||
|
MD007: false
|
||||||
|
|
||||||
|
# MD009/no-trailing-spaces Trailing spaces
|
||||||
|
MD009: false
|
||||||
|
|
||||||
|
# MD010/no-hard-tabs Hard tabs
|
||||||
|
MD010: false
|
||||||
|
|
||||||
|
# MD012/no-multiple-blanks Multiple consecutive blank lines
|
||||||
|
MD012: false
|
||||||
|
|
||||||
|
# MD013/line-length Line length
|
||||||
|
MD013: false
|
||||||
|
|
||||||
|
# MD014/commands-show-output Dollar signs used before commands without showing output
|
||||||
|
MD014: false
|
||||||
|
|
||||||
|
# MD018/no-missing-space-atx No space after hash on atx style heading
|
||||||
|
MD018: false
|
||||||
|
|
||||||
|
# MD019/no-multiple-space-atx Multiple spaces after hash on atx style heading
|
||||||
|
MD019: false
|
||||||
|
|
||||||
|
# MD022/blanks-around-headings Headings should be surrounded by blank lines
|
||||||
|
MD022: false
|
||||||
|
|
||||||
|
# MD023/heading-start-left Headings must start at the beginning of the line
|
||||||
|
MD023: false
|
||||||
|
|
||||||
|
# MD024/no-duplicate-heading Multiple headings with the same content
|
||||||
|
MD024: false
|
||||||
|
|
||||||
|
# MD025/single-title/single-h1 Multiple top-level headings in the same document
|
||||||
|
MD025: false
|
||||||
|
|
||||||
|
# MD026/no-trailing-punctuation Trailing punctuation in heading
|
||||||
|
MD026: false
|
||||||
|
|
||||||
|
# MD028/no-blanks-blockquote Blank line inside blockquote
|
||||||
|
MD028: false
|
||||||
|
|
||||||
|
# MD029/ol-prefix Ordered list item prefix
|
||||||
|
MD029: false
|
||||||
|
|
||||||
|
# MD031/blanks-around-fences Fenced code blocks should be surrounded by blank lines
|
||||||
|
MD031: false
|
||||||
|
|
||||||
|
# MD032/blanks-around-lists Lists should be surrounded by blank lines
|
||||||
|
MD032: false
|
||||||
|
|
||||||
|
# MD033/no-inline-html Inline HTML
|
||||||
|
MD033: false
|
||||||
|
|
||||||
|
# MD034/no-bare-urls Bare URL used
|
||||||
|
MD034: false
|
||||||
|
|
||||||
|
# MD036/no-emphasis-as-heading Emphasis used instead of a heading
|
||||||
|
MD036: false
|
||||||
|
|
||||||
|
# MD037/no-space-in-emphasis Spaces inside emphasis markers
|
||||||
|
MD037: false
|
||||||
|
|
||||||
|
# MD040/fenced-code-language Fenced code blocks should have a language specified
|
||||||
|
MD040: false
|
||||||
|
|
||||||
|
# MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading
|
||||||
|
MD041: false
|
||||||
|
|
||||||
|
# MD046/code-block-style Code block style
|
||||||
|
MD046: false
|
||||||
|
|
||||||
|
# MD052/reference-links-images Reference links and images should use a label that is defined
|
||||||
|
MD052: false
|
||||||
526
.github/linters/codespell.txt
vendored
Normal file
526
.github/linters/codespell.txt
vendored
Normal file
@ -0,0 +1,526 @@
|
|||||||
|
accouns
|
||||||
|
acheived
|
||||||
|
acount
|
||||||
|
actuall
|
||||||
|
acuiring
|
||||||
|
acumulate
|
||||||
|
addreess
|
||||||
|
addtion
|
||||||
|
adminstrator
|
||||||
|
afer
|
||||||
|
afrer
|
||||||
|
afterall
|
||||||
|
againt
|
||||||
|
ags
|
||||||
|
aktive
|
||||||
|
algoritm
|
||||||
|
allo
|
||||||
|
alloacate
|
||||||
|
allocted
|
||||||
|
alocation
|
||||||
|
alogrithm
|
||||||
|
alpha-numeric
|
||||||
|
alue
|
||||||
|
ammended
|
||||||
|
ammount
|
||||||
|
ans
|
||||||
|
anull
|
||||||
|
apche
|
||||||
|
aplication
|
||||||
|
apllication
|
||||||
|
applicatio
|
||||||
|
apporpriate
|
||||||
|
appropritate
|
||||||
|
aqcuire
|
||||||
|
aqcuired
|
||||||
|
aquire
|
||||||
|
aquiring
|
||||||
|
assiciate
|
||||||
|
assigne
|
||||||
|
assoication
|
||||||
|
assosiate
|
||||||
|
asssert
|
||||||
|
astroid
|
||||||
|
asynchroniously
|
||||||
|
asyncronous
|
||||||
|
atleast
|
||||||
|
atomation
|
||||||
|
attache
|
||||||
|
attch
|
||||||
|
attches
|
||||||
|
authenciation
|
||||||
|
authenitcation
|
||||||
|
authenitication
|
||||||
|
availiability
|
||||||
|
avialable
|
||||||
|
bais
|
||||||
|
beacause
|
||||||
|
beacuse
|
||||||
|
becase
|
||||||
|
becasue
|
||||||
|
becaues
|
||||||
|
behviour
|
||||||
|
birdge
|
||||||
|
bject
|
||||||
|
boardcast
|
||||||
|
bootstraper
|
||||||
|
bu
|
||||||
|
cant
|
||||||
|
capabilites
|
||||||
|
capablity
|
||||||
|
capcity
|
||||||
|
carrefully
|
||||||
|
cavaet
|
||||||
|
chaing
|
||||||
|
checkd
|
||||||
|
childs
|
||||||
|
choosen
|
||||||
|
chould
|
||||||
|
clenup
|
||||||
|
cliente
|
||||||
|
clinet
|
||||||
|
cluser
|
||||||
|
cna
|
||||||
|
collison
|
||||||
|
comman
|
||||||
|
commited
|
||||||
|
comparision
|
||||||
|
comparisions
|
||||||
|
complient
|
||||||
|
concious
|
||||||
|
conectix
|
||||||
|
confg
|
||||||
|
configruation
|
||||||
|
configuable
|
||||||
|
conneciton
|
||||||
|
connexion
|
||||||
|
constrait
|
||||||
|
constraits
|
||||||
|
containg
|
||||||
|
contex
|
||||||
|
continuesly
|
||||||
|
contro
|
||||||
|
controler
|
||||||
|
controles
|
||||||
|
controll
|
||||||
|
convienient
|
||||||
|
convinience
|
||||||
|
coputer
|
||||||
|
correcponding
|
||||||
|
correspoding
|
||||||
|
correspoonds
|
||||||
|
cosole
|
||||||
|
coudl
|
||||||
|
couldnt
|
||||||
|
craete
|
||||||
|
craeted
|
||||||
|
crate
|
||||||
|
crated
|
||||||
|
createa
|
||||||
|
createing
|
||||||
|
credentail
|
||||||
|
cros
|
||||||
|
crresponding
|
||||||
|
curren
|
||||||
|
currentl
|
||||||
|
datas
|
||||||
|
decalared
|
||||||
|
declatory
|
||||||
|
decocdes
|
||||||
|
decypher
|
||||||
|
defalut
|
||||||
|
defaut
|
||||||
|
defered
|
||||||
|
definiton
|
||||||
|
deleteable
|
||||||
|
dependancy
|
||||||
|
dependant
|
||||||
|
dependend
|
||||||
|
deployement
|
||||||
|
deply
|
||||||
|
deplying
|
||||||
|
dervied
|
||||||
|
descktop
|
||||||
|
descrption
|
||||||
|
deserialzed
|
||||||
|
desination
|
||||||
|
detination
|
||||||
|
detroy
|
||||||
|
detroying
|
||||||
|
dettach
|
||||||
|
dettached
|
||||||
|
dettaching
|
||||||
|
diabling
|
||||||
|
diasbled
|
||||||
|
dictonary
|
||||||
|
didnt
|
||||||
|
differnet
|
||||||
|
differnt
|
||||||
|
direcotry
|
||||||
|
directroy
|
||||||
|
disale
|
||||||
|
disbale
|
||||||
|
discrepency
|
||||||
|
disover
|
||||||
|
dissapper
|
||||||
|
dissassociated
|
||||||
|
divice
|
||||||
|
doesn'
|
||||||
|
doesnot
|
||||||
|
doesnt
|
||||||
|
dont'
|
||||||
|
doubleclick
|
||||||
|
dows
|
||||||
|
eanbled
|
||||||
|
earch
|
||||||
|
ect
|
||||||
|
elemnt
|
||||||
|
eles
|
||||||
|
elments
|
||||||
|
emmited
|
||||||
|
enble
|
||||||
|
encryted
|
||||||
|
enebled
|
||||||
|
enmpty
|
||||||
|
entires
|
||||||
|
enviornment
|
||||||
|
environmnet
|
||||||
|
equivalant
|
||||||
|
erro
|
||||||
|
erronous
|
||||||
|
everthing
|
||||||
|
everytime
|
||||||
|
excetion
|
||||||
|
excption
|
||||||
|
excute
|
||||||
|
execept
|
||||||
|
execption
|
||||||
|
execut
|
||||||
|
executeable
|
||||||
|
exeeded
|
||||||
|
exisitng
|
||||||
|
exisits
|
||||||
|
existin
|
||||||
|
existsing
|
||||||
|
exitting
|
||||||
|
expcted
|
||||||
|
expection
|
||||||
|
explaination
|
||||||
|
explicitely
|
||||||
|
faield
|
||||||
|
faild
|
||||||
|
failes
|
||||||
|
falied
|
||||||
|
fasion
|
||||||
|
feild
|
||||||
|
filenname
|
||||||
|
fillled
|
||||||
|
findout
|
||||||
|
fisrt
|
||||||
|
fo
|
||||||
|
folowing
|
||||||
|
fowarding
|
||||||
|
frist
|
||||||
|
fro
|
||||||
|
frontent
|
||||||
|
fuctionality
|
||||||
|
genarate
|
||||||
|
generallly
|
||||||
|
gernerate
|
||||||
|
get's
|
||||||
|
gloabal
|
||||||
|
gorry
|
||||||
|
gracefull
|
||||||
|
gradiant
|
||||||
|
handeling
|
||||||
|
hanling
|
||||||
|
happend
|
||||||
|
hasing
|
||||||
|
hasnt
|
||||||
|
hda
|
||||||
|
hostanme
|
||||||
|
hould
|
||||||
|
hsould
|
||||||
|
hte
|
||||||
|
identifers
|
||||||
|
identifyer
|
||||||
|
identifyers
|
||||||
|
igoring
|
||||||
|
immediatley
|
||||||
|
implememented
|
||||||
|
implementor
|
||||||
|
implementors
|
||||||
|
implemnt
|
||||||
|
implict
|
||||||
|
implmeneted
|
||||||
|
implmentation
|
||||||
|
incase
|
||||||
|
includeing
|
||||||
|
incosistency
|
||||||
|
indecates
|
||||||
|
indien
|
||||||
|
infor
|
||||||
|
informations
|
||||||
|
informaton
|
||||||
|
infrastrcuture
|
||||||
|
ingore
|
||||||
|
inital
|
||||||
|
initalize
|
||||||
|
initator
|
||||||
|
initilization
|
||||||
|
inspite
|
||||||
|
instace
|
||||||
|
instal
|
||||||
|
instnace
|
||||||
|
intefaces
|
||||||
|
intepret
|
||||||
|
intereface
|
||||||
|
interfer
|
||||||
|
interpretted
|
||||||
|
intialize
|
||||||
|
intializes
|
||||||
|
intializing
|
||||||
|
invlaid
|
||||||
|
invokation
|
||||||
|
isnt
|
||||||
|
ist
|
||||||
|
klunky
|
||||||
|
lable
|
||||||
|
leve
|
||||||
|
lief
|
||||||
|
limite
|
||||||
|
linke
|
||||||
|
listner
|
||||||
|
lokal
|
||||||
|
lokales
|
||||||
|
maintainence
|
||||||
|
maintenace
|
||||||
|
maintenence
|
||||||
|
mamagement
|
||||||
|
mambers
|
||||||
|
manaully
|
||||||
|
manuel
|
||||||
|
maxium
|
||||||
|
mehtod
|
||||||
|
mergable
|
||||||
|
mesage
|
||||||
|
messge
|
||||||
|
metatdata
|
||||||
|
milisecond
|
||||||
|
minumum
|
||||||
|
mis
|
||||||
|
modifers
|
||||||
|
mor
|
||||||
|
mot
|
||||||
|
mulitply
|
||||||
|
multipl
|
||||||
|
multple
|
||||||
|
mutliple
|
||||||
|
nast
|
||||||
|
nd
|
||||||
|
neccessary
|
||||||
|
necesary
|
||||||
|
netowrk
|
||||||
|
nin
|
||||||
|
nodel
|
||||||
|
nome
|
||||||
|
noone
|
||||||
|
nowe
|
||||||
|
numbe
|
||||||
|
numer
|
||||||
|
occured
|
||||||
|
occurence
|
||||||
|
occuring
|
||||||
|
offfering
|
||||||
|
ofthe
|
||||||
|
omited
|
||||||
|
onother
|
||||||
|
opeation
|
||||||
|
optin
|
||||||
|
orginal
|
||||||
|
otherwse
|
||||||
|
outter
|
||||||
|
overriden
|
||||||
|
overwritting
|
||||||
|
paramater
|
||||||
|
paramemeter
|
||||||
|
paramenter
|
||||||
|
paramete
|
||||||
|
parametrs
|
||||||
|
pararmeter
|
||||||
|
parms
|
||||||
|
parralels
|
||||||
|
particualr
|
||||||
|
passowrd
|
||||||
|
perfromed
|
||||||
|
permissble
|
||||||
|
physcial
|
||||||
|
plugable
|
||||||
|
pluging
|
||||||
|
polcies
|
||||||
|
policys
|
||||||
|
poluting
|
||||||
|
possiblity
|
||||||
|
potenial
|
||||||
|
prefered
|
||||||
|
preffered
|
||||||
|
pressenter
|
||||||
|
previleges
|
||||||
|
primay
|
||||||
|
priviledged
|
||||||
|
procuct
|
||||||
|
programatically
|
||||||
|
progres
|
||||||
|
properites
|
||||||
|
propertie
|
||||||
|
propertys
|
||||||
|
propogate
|
||||||
|
provison
|
||||||
|
psudo
|
||||||
|
pyhsical
|
||||||
|
readabilty
|
||||||
|
readd
|
||||||
|
reccuring
|
||||||
|
recevied
|
||||||
|
recieved
|
||||||
|
recursivelly
|
||||||
|
redunant
|
||||||
|
refference
|
||||||
|
releease
|
||||||
|
relese
|
||||||
|
remaning
|
||||||
|
remore
|
||||||
|
remvoing
|
||||||
|
renabling
|
||||||
|
repeatly
|
||||||
|
reponse
|
||||||
|
reqest
|
||||||
|
reqiured
|
||||||
|
requieres
|
||||||
|
requried
|
||||||
|
reserv
|
||||||
|
reserverd
|
||||||
|
reseted
|
||||||
|
reseting
|
||||||
|
resorce
|
||||||
|
responser
|
||||||
|
resposne
|
||||||
|
resturns
|
||||||
|
retreive
|
||||||
|
retreiving
|
||||||
|
retrive
|
||||||
|
retrived
|
||||||
|
retriving
|
||||||
|
retrun
|
||||||
|
retuned
|
||||||
|
returing
|
||||||
|
re-use
|
||||||
|
rever
|
||||||
|
rocessor
|
||||||
|
runing
|
||||||
|
runnign
|
||||||
|
sate
|
||||||
|
scalled
|
||||||
|
scipt
|
||||||
|
scirpt
|
||||||
|
scrip
|
||||||
|
seconadry
|
||||||
|
seconday
|
||||||
|
seesion
|
||||||
|
sepcified
|
||||||
|
sepcify
|
||||||
|
seprated
|
||||||
|
ser
|
||||||
|
servies
|
||||||
|
seting
|
||||||
|
settig
|
||||||
|
sevices
|
||||||
|
shoul
|
||||||
|
shoule
|
||||||
|
sie
|
||||||
|
signle
|
||||||
|
simplier
|
||||||
|
singature
|
||||||
|
skiping
|
||||||
|
snaphsot
|
||||||
|
snpashot
|
||||||
|
specied
|
||||||
|
specifed
|
||||||
|
specifiy
|
||||||
|
splitted
|
||||||
|
spped
|
||||||
|
standy
|
||||||
|
statics
|
||||||
|
stickyness
|
||||||
|
stil
|
||||||
|
stip
|
||||||
|
storeage
|
||||||
|
strat
|
||||||
|
streched
|
||||||
|
strutural
|
||||||
|
succesfull
|
||||||
|
successfull
|
||||||
|
suceessful
|
||||||
|
suces
|
||||||
|
sucessfully
|
||||||
|
suiteable
|
||||||
|
suppots
|
||||||
|
suppport
|
||||||
|
syncronous
|
||||||
|
syste
|
||||||
|
tage
|
||||||
|
te
|
||||||
|
tempdate
|
||||||
|
testng
|
||||||
|
tha
|
||||||
|
thats
|
||||||
|
ther
|
||||||
|
therefor
|
||||||
|
theres
|
||||||
|
theses
|
||||||
|
thi
|
||||||
|
thorugh
|
||||||
|
throught
|
||||||
|
ths
|
||||||
|
tipically
|
||||||
|
transction
|
||||||
|
tring
|
||||||
|
trough
|
||||||
|
tyoe
|
||||||
|
ue
|
||||||
|
ues
|
||||||
|
unavailibility
|
||||||
|
uncommited
|
||||||
|
uncompressible
|
||||||
|
uneccessarily
|
||||||
|
unexepected
|
||||||
|
unexpect
|
||||||
|
unknow
|
||||||
|
unkonw
|
||||||
|
unkown
|
||||||
|
unneccessary
|
||||||
|
unparseable
|
||||||
|
unrecoginized
|
||||||
|
unsupport
|
||||||
|
unxpected
|
||||||
|
updat
|
||||||
|
uptodate
|
||||||
|
usera
|
||||||
|
usign
|
||||||
|
usin
|
||||||
|
utlization
|
||||||
|
vaidate
|
||||||
|
valiate
|
||||||
|
valule
|
||||||
|
valus
|
||||||
|
varibles
|
||||||
|
verfy
|
||||||
|
verfying
|
||||||
|
verifing
|
||||||
|
virutal
|
||||||
|
visable
|
||||||
|
wakup
|
||||||
|
wil
|
||||||
|
wit
|
||||||
|
wll
|
||||||
|
wth
|
||||||
4
.github/workflows/build.yml
vendored
4
.github/workflows/build.yml
vendored
@ -41,9 +41,9 @@ jobs:
|
|||||||
cache: maven
|
cache: maven
|
||||||
|
|
||||||
- name: Set up Python
|
- name: Set up Python
|
||||||
uses: actions/setup-python@v4
|
uses: actions/setup-python@v5
|
||||||
with:
|
with:
|
||||||
python-version: '3.8'
|
python-version: '3.10'
|
||||||
architecture: 'x64'
|
architecture: 'x64'
|
||||||
|
|
||||||
- name: Install Build Dependencies
|
- name: Install Build Dependencies
|
||||||
|
|||||||
34
.github/workflows/ci.yml
vendored
34
.github/workflows/ci.yml
vendored
@ -29,7 +29,7 @@ permissions:
|
|||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
if: github.repository == 'apache/cloudstack'
|
if: github.repository == 'apache/cloudstack'
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
@ -87,7 +87,9 @@ jobs:
|
|||||||
smoke/test_migration
|
smoke/test_migration
|
||||||
smoke/test_multipleips_per_nic
|
smoke/test_multipleips_per_nic
|
||||||
smoke/test_nested_virtualization
|
smoke/test_nested_virtualization
|
||||||
smoke/test_set_sourcenat",
|
smoke/test_set_sourcenat
|
||||||
|
smoke/test_webhook_lifecycle
|
||||||
|
smoke/test_purge_expunged_vms",
|
||||||
"smoke/test_network
|
"smoke/test_network
|
||||||
smoke/test_network_acl
|
smoke/test_network_acl
|
||||||
smoke/test_network_ipv6
|
smoke/test_network_ipv6
|
||||||
@ -133,6 +135,7 @@ jobs:
|
|||||||
smoke/test_usage
|
smoke/test_usage
|
||||||
smoke/test_usage_events
|
smoke/test_usage_events
|
||||||
smoke/test_vm_deployment_planner
|
smoke/test_vm_deployment_planner
|
||||||
|
smoke/test_vm_strict_host_tags
|
||||||
smoke/test_vm_schedule
|
smoke/test_vm_schedule
|
||||||
smoke/test_vm_life_cycle
|
smoke/test_vm_life_cycle
|
||||||
smoke/test_vm_lifecycle_unmanage_import
|
smoke/test_vm_lifecycle_unmanage_import
|
||||||
@ -181,7 +184,8 @@ jobs:
|
|||||||
"component/test_project_usage
|
"component/test_project_usage
|
||||||
component/test_protocol_number_security_group
|
component/test_protocol_number_security_group
|
||||||
component/test_public_ip
|
component/test_public_ip
|
||||||
component/test_resource_limits",
|
component/test_resource_limits
|
||||||
|
component/test_resource_limit_tags",
|
||||||
"component/test_regions_accounts
|
"component/test_regions_accounts
|
||||||
component/test_routers
|
component/test_routers
|
||||||
component/test_snapshots
|
component/test_snapshots
|
||||||
@ -228,7 +232,25 @@ jobs:
|
|||||||
- name: Install Build Dependencies
|
- name: Install Build Dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y git uuid-runtime genisoimage netcat ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
|
sudo apt-get install -y git uuid-runtime genisoimage netcat-openbsd ipmitool build-essential libgcrypt20 libgpg-error-dev libgpg-error0 libopenipmi0 ipmitool libpython3-dev libssl-dev libffi-dev python3-openssl python3-dev python3-setuptools
|
||||||
|
|
||||||
|
- name: Setup IPMI Tool for CloudStack
|
||||||
|
run: |
|
||||||
|
# Create cloudstack-common directory if it doesn't exist
|
||||||
|
sudo mkdir -p /usr/share/cloudstack-common
|
||||||
|
|
||||||
|
# Copy ipmitool to cloudstack-common directory if it doesn't exist
|
||||||
|
if [ ! -f /usr/share/cloudstack-common/ipmitool ]; then
|
||||||
|
sudo cp /usr/bin/ipmitool /usr/share/cloudstack-common/ipmitool
|
||||||
|
sudo chmod 755 /usr/share/cloudstack-common/ipmitool
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create ipmitool-C3 wrapper script
|
||||||
|
sudo tee /usr/bin/ipmitool > /dev/null << 'EOF'
|
||||||
|
#!/bin/bash
|
||||||
|
/usr/share/cloudstack-common/ipmitool -C3 $@
|
||||||
|
EOF
|
||||||
|
sudo chmod 755 /usr/bin/ipmitool
|
||||||
|
|
||||||
- name: Install Python dependencies
|
- name: Install Python dependencies
|
||||||
run: |
|
run: |
|
||||||
@ -267,7 +289,7 @@ jobs:
|
|||||||
- name: Setup Simulator Prerequisites
|
- name: Setup Simulator Prerequisites
|
||||||
run: |
|
run: |
|
||||||
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
|
sudo python3 -m pip install --upgrade netaddr mysql-connector-python
|
||||||
python3 -m pip install --user --upgrade tools/marvin/dist/Marvin-*.tar.gz
|
python3 -m pip install --user --upgrade tools/marvin/dist/[mM]arvin-*.tar.gz
|
||||||
mvn -q -Pdeveloper -pl developer -Ddeploydb
|
mvn -q -Pdeveloper -pl developer -Ddeploydb
|
||||||
mvn -q -Pdeveloper -pl developer -Ddeploydb-simulator
|
mvn -q -Pdeveloper -pl developer -Ddeploydb-simulator
|
||||||
|
|
||||||
@ -280,7 +302,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Start CloudStack Management Server with Simulator
|
- name: Start CloudStack Management Server with Simulator
|
||||||
run: |
|
run: |
|
||||||
export MAVEN_OPTS="-Xmx4096m -XX:MaxPermSize=800m -Djava.security.egd=file:/dev/urandom -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver"
|
export MAVEN_OPTS="-Xmx4096m -XX:MaxMetaspaceSize=800m -Djava.security.egd=file:/dev/urandom -javaagent:jacoco/lib/jacocoagent.jar=address=*,port=36320,output=tcpserver --add-opens=java.base/java.lang=ALL-UNNAMED --add-exports=java.base/sun.security.x509=ALL-UNNAMED --add-opens=java.base/jdk.internal.reflect=ALL-UNNAMED"
|
||||||
echo -e "\nStarting simulator"
|
echo -e "\nStarting simulator"
|
||||||
set +e
|
set +e
|
||||||
mvn -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120 -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log || true &
|
mvn -Dsimulator -Dorg.eclipse.jetty.annotations.maxWait=120 -pl :cloud-client-ui jetty:run 2>&1 > /tmp/jetty-log || true &
|
||||||
|
|||||||
4
.github/workflows/codecov.yml
vendored
4
.github/workflows/codecov.yml
vendored
@ -36,11 +36,11 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK11
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
cache: 'maven'
|
cache: 'maven'
|
||||||
|
|
||||||
- name: Build CloudStack with Quality Checks
|
- name: Build CloudStack with Quality Checks
|
||||||
|
|||||||
2
.github/workflows/linter.yml
vendored
2
.github/workflows/linter.yml
vendored
@ -39,7 +39,7 @@ jobs:
|
|||||||
pip install pre-commit
|
pip install pre-commit
|
||||||
- name: Set PY
|
- name: Set PY
|
||||||
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
|
||||||
- uses: actions/cache@v3
|
- uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.cache/pre-commit
|
path: ~/.cache/pre-commit
|
||||||
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}
|
||||||
|
|||||||
10
.github/workflows/main-sonar-check.yml
vendored
10
.github/workflows/main-sonar-check.yml
vendored
@ -36,25 +36,25 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK11
|
- name: Set up JDK17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
cache: 'maven'
|
cache: 'maven'
|
||||||
|
|
||||||
- name: Cache SonarCloud packages
|
- name: Cache SonarCloud packages
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.sonar/cache
|
path: ~/.sonar/cache
|
||||||
key: ${{ runner.os }}-sonar
|
key: ${{ runner.os }}-sonar
|
||||||
restore-keys: ${{ runner.os }}-sonar
|
restore-keys: ${{ runner.os }}-sonar
|
||||||
|
|
||||||
- name: Cache local Maven repository
|
- name: Cache local Maven repository
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.m2/repository
|
path: ~/.m2/repository
|
||||||
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml', '*/pom.xml', '*/*/pom.xml', '*/*/*/pom.xml') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-m2
|
${{ runner.os }}-m2
|
||||||
|
|
||||||
|
|||||||
4
.github/workflows/rat.yml
vendored
4
.github/workflows/rat.yml
vendored
@ -31,10 +31,10 @@ jobs:
|
|||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
- name: Set up JDK 11
|
- name: Set up JDK 17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
distribution: 'adopt'
|
distribution: 'adopt'
|
||||||
architecture: x64
|
architecture: x64
|
||||||
cache: maven
|
cache: maven
|
||||||
|
|||||||
10
.github/workflows/sonar-check.yml
vendored
10
.github/workflows/sonar-check.yml
vendored
@ -38,25 +38,25 @@ jobs:
|
|||||||
ref: "refs/pull/${{ github.event.number }}/merge"
|
ref: "refs/pull/${{ github.event.number }}/merge"
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
|
||||||
- name: Set up JDK11
|
- name: Set up JDK17
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
cache: 'maven'
|
cache: 'maven'
|
||||||
|
|
||||||
- name: Cache SonarCloud packages
|
- name: Cache SonarCloud packages
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.sonar/cache
|
path: ~/.sonar/cache
|
||||||
key: ${{ runner.os }}-sonar
|
key: ${{ runner.os }}-sonar
|
||||||
restore-keys: ${{ runner.os }}-sonar
|
restore-keys: ${{ runner.os }}-sonar
|
||||||
|
|
||||||
- name: Cache local Maven repository
|
- name: Cache local Maven repository
|
||||||
uses: actions/cache@v3
|
uses: actions/cache@v4
|
||||||
with:
|
with:
|
||||||
path: ~/.m2/repository
|
path: ~/.m2/repository
|
||||||
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
|
key: ${{ runner.os }}-m2-${{ hashFiles('pom.xml', '*/pom.xml', '*/*/pom.xml', '*/*/*/pom.xml') }}
|
||||||
restore-keys: |
|
restore-keys: |
|
||||||
${{ runner.os }}-m2
|
${{ runner.os }}-m2
|
||||||
|
|
||||||
|
|||||||
2
.github/workflows/ui.yml
vendored
2
.github/workflows/ui.yml
vendored
@ -36,7 +36,7 @@ jobs:
|
|||||||
- name: Set up Node
|
- name: Set up Node
|
||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 14
|
node-version: 16
|
||||||
|
|
||||||
- name: Env details
|
- name: Env details
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
150
.gitignore
vendored
150
.gitignore
vendored
@ -15,92 +15,92 @@
|
|||||||
# specific language governing permissions and limitations
|
# specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
build/build.number
|
|
||||||
.lock-wscript
|
|
||||||
.waf-*
|
|
||||||
waf-*
|
|
||||||
target/
|
|
||||||
override/
|
|
||||||
.metadata
|
|
||||||
dist/
|
|
||||||
*~
|
*~
|
||||||
|
*_flymake.js
|
||||||
*.bak
|
*.bak
|
||||||
cloud-*.tar.bz2
|
*.css.map
|
||||||
*.log
|
|
||||||
*.pyc
|
|
||||||
*.patch
|
|
||||||
*.egginfo/
|
*.egginfo/
|
||||||
*.egg-info/
|
*.egg-info/
|
||||||
*.prefs
|
|
||||||
build.number
|
|
||||||
*.log.*
|
|
||||||
cloud.log.*.*
|
|
||||||
unittest
|
|
||||||
deps/cloud.userlibraries
|
|
||||||
.DS_Store
|
|
||||||
.idea
|
|
||||||
*.iml
|
*.iml
|
||||||
git-remote-https.exe.stackdump
|
|
||||||
*.swp
|
|
||||||
tools/devcloud/devcloudbox/.vagrant
|
|
||||||
tools/cli/cloudmonkey/marvin/
|
|
||||||
tools/cli/cloudmonkey/precache.py
|
|
||||||
tools/marvin/marvin/cloudstackAPI/
|
|
||||||
tools/marvin/build/
|
|
||||||
tools/cli/build/
|
|
||||||
tools/appliance/systemvmtemplate/packer_cache/
|
|
||||||
*.jar
|
|
||||||
*.war
|
|
||||||
*.mar
|
|
||||||
*.iso
|
*.iso
|
||||||
|
*.jar
|
||||||
|
*.log
|
||||||
|
*.log.*
|
||||||
|
*.mar
|
||||||
|
*.orig
|
||||||
|
*.patch
|
||||||
|
*.prefs
|
||||||
|
*.pyc
|
||||||
|
*.qcow2
|
||||||
|
*.raw
|
||||||
|
*.swp
|
||||||
*.tar.gz
|
*.tar.gz
|
||||||
*.tgz
|
*.tgz
|
||||||
*.vscode
|
*.vscode
|
||||||
*.css.map
|
*.war
|
||||||
|
.DS_Store
|
||||||
|
.checkstyle
|
||||||
|
.classpath
|
||||||
|
.idea
|
||||||
|
.lock-wscript
|
||||||
|
.metadata
|
||||||
|
.pmd
|
||||||
|
.pmdruleset.xml
|
||||||
|
.project
|
||||||
|
.pydevproject
|
||||||
|
.reviewboardrc
|
||||||
|
.settings.xml
|
||||||
|
.settings/
|
||||||
|
.vscode
|
||||||
|
.waf-*
|
||||||
|
Gemfile.lock
|
||||||
|
build/build.number
|
||||||
|
build.number
|
||||||
|
build-indep-stamp
|
||||||
|
cloud.log.*.*
|
||||||
|
cloud-*.tar.bz2
|
||||||
|
configure-stamp
|
||||||
|
db.properties.override
|
||||||
|
debian/*.debhelper
|
||||||
|
debian/*.substvars
|
||||||
|
debian/cloudstack-*/*
|
||||||
|
debian/files
|
||||||
|
debian/tmp
|
||||||
|
deps/cloud.userlibraries
|
||||||
|
dist/
|
||||||
|
docs/publish
|
||||||
|
docs/runbook/publish
|
||||||
|
docs/runbook/tmp
|
||||||
|
docs/tmp
|
||||||
|
engine/storage/integration-test/test-output
|
||||||
|
git-remote-https.exe.stackdump
|
||||||
|
node_modules
|
||||||
|
override/
|
||||||
|
plugins/hypervisors/kvm/.pydevproject
|
||||||
|
plugins/network-elements/juniper-contrail/logs/
|
||||||
|
replace.properties.override
|
||||||
|
replace.properties.tmp
|
||||||
|
scripts/.pydevproject
|
||||||
|
scripts/vm/hypervisor/xenserver/vhd-util
|
||||||
|
systemvm/.pydevproject
|
||||||
|
target/
|
||||||
|
target-eclipse
|
||||||
|
test/.pydevprojec
|
||||||
|
tools/apidoc/log/
|
||||||
|
tools/appliance/box/
|
||||||
|
tools/appliance/systemvmtemplate/packer_cache/
|
||||||
|
tools/cli/build/
|
||||||
|
tools/cli/cloudmonkey/marvin/
|
||||||
|
tools/cli/cloudmonkey/precache.py
|
||||||
|
tools/devcloud/devcloudbox/.vagrant
|
||||||
|
tools/marvin/build/
|
||||||
|
tools/marvin/marvin/cloudstackAPI/
|
||||||
|
tools/marvin/marvin/cloudstackAPI/*
|
||||||
|
unittest
|
||||||
|
venv
|
||||||
|
waf-*
|
||||||
|
|
||||||
# this ignores _all files starting with '.'. Don't do that!
|
# this ignores _all files starting with '.'. Don't do that!
|
||||||
#.*
|
#.*
|
||||||
|
|
||||||
target-eclipse
|
|
||||||
!.gitignore
|
!.gitignore
|
||||||
.classpath
|
|
||||||
.settings.xml
|
|
||||||
.settings/
|
|
||||||
db.properties.override
|
|
||||||
replace.properties.override
|
|
||||||
tools/marvin/marvin/cloudstackAPI/*
|
|
||||||
docs/tmp
|
|
||||||
docs/publish
|
|
||||||
docs/runbook/tmp
|
|
||||||
docs/runbook/publish
|
|
||||||
.project
|
|
||||||
Gemfile.lock
|
|
||||||
debian/tmp
|
|
||||||
debian/files
|
|
||||||
debian/cloudstack-*/*
|
|
||||||
debian/*.substvars
|
|
||||||
debian/*.debhelper
|
|
||||||
replace.properties.tmp
|
|
||||||
build-indep-stamp
|
|
||||||
configure-stamp
|
|
||||||
*_flymake.js
|
|
||||||
engine/storage/integration-test/test-output
|
|
||||||
tools/apidoc/log/
|
|
||||||
plugins/network-elements/juniper-contrail/logs/
|
|
||||||
scripts/vm/hypervisor/xenserver/vhd-util
|
|
||||||
*.orig
|
|
||||||
tools/appliance/box/
|
|
||||||
.reviewboardrc
|
|
||||||
.checkstyle
|
|
||||||
.pmd
|
|
||||||
.pmdruleset.xml
|
|
||||||
.pydevproject
|
|
||||||
systemvm/.pydevproject
|
|
||||||
test/.pydevprojec
|
|
||||||
plugins/hypervisors/kvm/.pydevproject
|
|
||||||
scripts/.pydevproject
|
|
||||||
*.qcow2
|
|
||||||
*.raw
|
|
||||||
venv
|
|
||||||
node_modules
|
|
||||||
.vscode
|
|
||||||
|
|||||||
@ -26,7 +26,7 @@ repos:
|
|||||||
- id: identity
|
- id: identity
|
||||||
- id: check-hooks-apply
|
- id: check-hooks-apply
|
||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v4.4.0
|
rev: v4.6.0
|
||||||
hooks:
|
hooks:
|
||||||
#- id: check-added-large-files
|
#- id: check-added-large-files
|
||||||
- id: check-case-conflict
|
- id: check-case-conflict
|
||||||
@ -36,6 +36,8 @@ repos:
|
|||||||
- id: check-vcs-permalinks
|
- id: check-vcs-permalinks
|
||||||
#- id: check-yaml
|
#- id: check-yaml
|
||||||
- id: destroyed-symlinks
|
- id: destroyed-symlinks
|
||||||
|
- id: detect-aws-credentials
|
||||||
|
args: [--allow-missing-credentials]
|
||||||
- id: detect-private-key
|
- id: detect-private-key
|
||||||
exclude: >
|
exclude: >
|
||||||
(?x)
|
(?x)
|
||||||
@ -53,11 +55,23 @@ repos:
|
|||||||
- id: end-of-file-fixer
|
- id: end-of-file-fixer
|
||||||
exclude: \.vhd$
|
exclude: \.vhd$
|
||||||
#- id: fix-byte-order-marker
|
#- id: fix-byte-order-marker
|
||||||
|
- id: forbid-submodules
|
||||||
- id: mixed-line-ending
|
- id: mixed-line-ending
|
||||||
exclude: \.(cs|xml)$
|
exclude: \.(cs|xml)$
|
||||||
# - id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
|
files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
|
||||||
|
args: [--markdown-linebreak-ext=md]
|
||||||
|
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
|
||||||
|
- repo: https://github.com/codespell-project/codespell
|
||||||
|
rev: v2.2.6
|
||||||
|
hooks:
|
||||||
|
- id: codespell
|
||||||
|
name: run codespell
|
||||||
|
description: Check spelling with codespell
|
||||||
|
args: [--ignore-words=.github/linters/codespell.txt]
|
||||||
|
exclude: ^ui/package\.json$|^ui/package-lock\.json$|^ui/public/js/less\.min\.js$|^ui/public/locales/.*[^n].*\.json$
|
||||||
- repo: https://github.com/pycqa/flake8
|
- repo: https://github.com/pycqa/flake8
|
||||||
rev: 6.1.0
|
rev: 7.0.0
|
||||||
hooks:
|
hooks:
|
||||||
- id: flake8
|
- id: flake8
|
||||||
args: [--config, .github/linters/.flake8]
|
args: [--config, .github/linters/.flake8]
|
||||||
@ -72,3 +86,12 @@ repos:
|
|||||||
^scripts/vm/hypervisor/xenserver/vmopspremium$|
|
^scripts/vm/hypervisor/xenserver/vmopspremium$|
|
||||||
^setup/bindir/cloud-setup-encryption\.in$|
|
^setup/bindir/cloud-setup-encryption\.in$|
|
||||||
^venv/.*$
|
^venv/.*$
|
||||||
|
- repo: https://github.com/igorshubovych/markdownlint-cli
|
||||||
|
rev: v0.40.0
|
||||||
|
hooks:
|
||||||
|
- id: markdownlint
|
||||||
|
name: run markdownlint
|
||||||
|
description: check Markdown files with markdownlint
|
||||||
|
args: [--config=.github/linters/.markdown-lint.yml]
|
||||||
|
types: [markdown]
|
||||||
|
files: \.(md|mdown|markdown)$
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
3.6
|
3.10
|
||||||
|
|||||||
@ -15,7 +15,7 @@ was tested against a CentOS 7 x86_64 setup.
|
|||||||
|
|
||||||
Install tools and dependencies used for development:
|
Install tools and dependencies used for development:
|
||||||
|
|
||||||
# yum -y install git java-11-openjdk java-11-openjdk-devel \
|
# yum -y install git java-17-openjdk java-17-openjdk-devel \
|
||||||
mysql mysql-server mkisofs git gcc python MySQL-python openssh-clients wget
|
mysql mysql-server mkisofs git gcc python MySQL-python openssh-clients wget
|
||||||
|
|
||||||
Set up Maven (3.6.0):
|
Set up Maven (3.6.0):
|
||||||
@ -78,7 +78,7 @@ Clear old database (if any) and deploy the database schema:
|
|||||||
|
|
||||||
Export the following variable if you need to run and debug the management server:
|
Export the following variable if you need to run and debug the management server:
|
||||||
|
|
||||||
$ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
|
$ export MAVEN_OPTS="-Xmx1024m -XX:MaxMetaspaceSize=500m -Xdebug -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
|
||||||
|
|
||||||
Start the management server:
|
Start the management server:
|
||||||
|
|
||||||
|
|||||||
@ -20,6 +20,19 @@ import os
|
|||||||
import logging
|
import logging
|
||||||
import sys
|
import sys
|
||||||
import socket
|
import socket
|
||||||
|
|
||||||
|
# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----
|
||||||
|
# ---- We do this so cloud_utils can be looked up in the following order:
|
||||||
|
# ---- 1) Sources directory
|
||||||
|
# ---- 2) waf configured PYTHONDIR
|
||||||
|
# ---- 3) System Python path
|
||||||
|
for pythonpath in (
|
||||||
|
"@PYTHONDIR@",
|
||||||
|
os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),
|
||||||
|
):
|
||||||
|
if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)
|
||||||
|
# ---- End snippet of code ----
|
||||||
|
|
||||||
from cloudutils.cloudException import CloudRuntimeException, CloudInternalException
|
from cloudutils.cloudException import CloudRuntimeException, CloudInternalException
|
||||||
from cloudutils.utilities import initLoging, bash
|
from cloudutils.utilities import initLoging, bash
|
||||||
from cloudutils.configFileOps import configFileOps
|
from cloudutils.configFileOps import configFileOps
|
||||||
|
|||||||
@ -20,6 +20,19 @@ import sys
|
|||||||
import os
|
import os
|
||||||
import subprocess
|
import subprocess
|
||||||
from threading import Timer
|
from threading import Timer
|
||||||
|
|
||||||
|
# ---- This snippet of code adds the sources path and the waf configured PYTHONDIR to the Python path ----
|
||||||
|
# ---- We do this so cloud_utils can be looked up in the following order:
|
||||||
|
# ---- 1) Sources directory
|
||||||
|
# ---- 2) waf configured PYTHONDIR
|
||||||
|
# ---- 3) System Python path
|
||||||
|
for pythonpath in (
|
||||||
|
"@PYTHONDIR@",
|
||||||
|
os.path.join(os.path.dirname(__file__),os.path.pardir,os.path.pardir,"python","lib"),
|
||||||
|
):
|
||||||
|
if os.path.isdir(pythonpath): sys.path.insert(0,pythonpath)
|
||||||
|
# ---- End snippet of code ----
|
||||||
|
|
||||||
from xml.dom.minidom import parse
|
from xml.dom.minidom import parse
|
||||||
from cloudutils.configFileOps import configFileOps
|
from cloudutils.configFileOps import configFileOps
|
||||||
from cloudutils.networkConfig import networkConfig
|
from cloudutils.networkConfig import networkConfig
|
||||||
|
|||||||
@ -286,6 +286,7 @@ hypervisor.type=kvm
|
|||||||
|
|
||||||
# The model of Watchdog timer to present to the Guest.
|
# The model of Watchdog timer to present to the Guest.
|
||||||
# For all models refer to the libvirt documentation.
|
# For all models refer to the libvirt documentation.
|
||||||
|
# PLEASE NOTE: to disable the watchdogs definitions, use value: none
|
||||||
#vm.watchdog.model=i6300esb
|
#vm.watchdog.model=i6300esb
|
||||||
|
|
||||||
# Action to take when the Guest/Instance is no longer notifying the Watchdog timer.
|
# Action to take when the Guest/Instance is no longer notifying the Watchdog timer.
|
||||||
@ -430,3 +431,13 @@ iscsi.session.cleanup.enabled=false
|
|||||||
# If set to "true", the agent will register for libvirt domain events, allowing for immediate updates on crashed or
|
# If set to "true", the agent will register for libvirt domain events, allowing for immediate updates on crashed or
|
||||||
# unexpectedly stopped. Experimental, requires agent restart.
|
# unexpectedly stopped. Experimental, requires agent restart.
|
||||||
# libvirt.events.enabled=false
|
# libvirt.events.enabled=false
|
||||||
|
|
||||||
|
# Implicit host tags managed by agent.properties
|
||||||
|
# host.tags=
|
||||||
|
|
||||||
|
# Timeout(in seconds) for SSL handshake when agent connects to server. When no value is set then default value of 30s
|
||||||
|
# will be used
|
||||||
|
#ssl.handshake.timeout=
|
||||||
|
|
||||||
|
# Wait(in seconds) during agent reconnections. When no value is set then default value of 5s will be used
|
||||||
|
#backoff.seconds=
|
||||||
|
|||||||
@ -15,11 +15,13 @@
|
|||||||
# specific language governing permissions and limitations
|
# specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log {
|
/var/log/cloudstack/agent/security_group.log /var/log/cloudstack/agent/resizevolume.log /var/log/cloudstack/agent/rolling-maintenance.log /var/log/cloudstack/agent/agent.out /var/log/cloudstack/agent/agent.err {
|
||||||
copytruncate
|
copytruncate
|
||||||
daily
|
daily
|
||||||
rotate 5
|
rotate 5
|
||||||
compress
|
compress
|
||||||
missingok
|
missingok
|
||||||
size 10M
|
size 10M
|
||||||
|
dateext
|
||||||
|
dateformat -%Y-%m-%d
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,91 +17,60 @@ KIND, either express or implied. See the License for the
|
|||||||
specific language governing permissions and limitations
|
specific language governing permissions and limitations
|
||||||
under the License.
|
under the License.
|
||||||
-->
|
-->
|
||||||
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
|
<Configuration monitorInterval="60">
|
||||||
|
<Appenders>
|
||||||
|
|
||||||
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
|
<!-- ================================= -->
|
||||||
|
<!-- Preserve messages in a local file -->
|
||||||
|
<!-- ================================= -->
|
||||||
|
|
||||||
<!-- ================================= -->
|
<!-- A time/date based rolling appender -->
|
||||||
<!-- Preserve messages in a local file -->
|
<RollingFile name="FILE" append="true" fileName="@AGENTLOG@" filePattern="@AGENTLOG@.%d{yyyy-MM-dd}.gz">
|
||||||
<!-- ================================= -->
|
<ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||||
|
<Policies>
|
||||||
|
<TimeBasedTriggeringPolicy/>
|
||||||
|
</Policies>
|
||||||
|
<PatternLayout pattern="%d{DEFAULT} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
|
||||||
|
</RollingFile>
|
||||||
|
|
||||||
<!-- A time/date based rolling appender -->
|
<!-- ============================== -->
|
||||||
<appender name="FILE" class="org.apache.log4j.rolling.RollingFileAppender">
|
<!-- Append messages to the console -->
|
||||||
<param name="Append" value="true"/>
|
<!-- ============================== -->
|
||||||
<param name="Threshold" value="INFO"/>
|
|
||||||
<rollingPolicy class="org.apache.log4j.rolling.TimeBasedRollingPolicy">
|
|
||||||
<param name="FileNamePattern" value="@AGENTLOG@.%d{yyyy-MM-dd}.gz"/>
|
|
||||||
<param name="ActiveFileName" value="@AGENTLOG@"/>
|
|
||||||
</rollingPolicy>
|
|
||||||
<layout class="org.apache.log4j.EnhancedPatternLayout">
|
|
||||||
<param name="ConversionPattern" value="%d{ISO8601} %-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
|
|
||||||
</layout>
|
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- ============================== -->
|
<Console name="CONSOLE" target="SYSTEM_OUT">
|
||||||
<!-- Append messages to the console -->
|
<ThresholdFilter level="OFF" onMatch="ACCEPT" onMismatch="DENY"/>
|
||||||
<!-- ============================== -->
|
<PatternLayout pattern="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%ex%n"/>
|
||||||
|
</Console>
|
||||||
|
</Appenders>
|
||||||
|
|
||||||
<appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
|
<Loggers>
|
||||||
<param name="Target" value="System.out"/>
|
|
||||||
<param name="Threshold" value="INFO"/>
|
|
||||||
|
|
||||||
<layout class="org.apache.log4j.PatternLayout">
|
<!-- ================ -->
|
||||||
<param name="ConversionPattern" value="%-5p [%c{3}] (%t:%x) (logid:%X{logcontextid}) %m%n"/>
|
<!-- Limit categories -->
|
||||||
</layout>
|
<!-- ================ -->
|
||||||
</appender>
|
|
||||||
|
|
||||||
<!-- ================ -->
|
<Logger name="com.cloud" level="INFO"/>
|
||||||
<!-- Limit categories -->
|
|
||||||
<!-- ================ -->
|
|
||||||
|
|
||||||
<category name="com.cloud">
|
<Logger name="org.apache" level="INFO"/>
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<category name="com.cloud.agent.metrics">
|
<Logger name="org" level="INFO"/>
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<category name="com.cloud.agent.resource.computing.ComputingResource$StorageMonitorTask">
|
<Logger name="net" level="INFO"/>
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
|
<Logger name="com.amazonaws" level="INFO"/>
|
||||||
<category name="org.apache">
|
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<category name="org">
|
<Logger name="httpclient.wire" level="INFO"/>
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<category name="net">
|
<Logger name="org.apache.http.wire" level="INFO"/>
|
||||||
<priority value="INFO"/>
|
|
||||||
</category>
|
|
||||||
|
|
||||||
<!-- Limit the com.amazonaws category to INFO as its DEBUG is verbose -->
|
<!-- ======================= -->
|
||||||
<category name="com.amazonaws">
|
<!-- Setup the Root category -->
|
||||||
<priority value="INFO"/>
|
<!-- ======================= -->
|
||||||
</category>
|
|
||||||
|
|
||||||
<!-- Limit the httpclient.wire category to INFO as its DEBUG is verbose -->
|
<Root level="INFO">
|
||||||
<category name="httpclient.wire">
|
<AppenderRef ref="CONSOLE"/>
|
||||||
<priority value="INFO"/>
|
<AppenderRef ref="FILE"/>
|
||||||
</category>
|
</Root>
|
||||||
|
|
||||||
<category name="org.apache.http.wire">
|
</Loggers>
|
||||||
<priority value="INFO"/>
|
</Configuration>
|
||||||
</category>
|
|
||||||
|
|
||||||
<!-- ======================= -->
|
|
||||||
<!-- Setup the Root category -->
|
|
||||||
<!-- ======================= -->
|
|
||||||
|
|
||||||
<root>
|
|
||||||
<level value="INFO"/>
|
|
||||||
<appender-ref ref="CONSOLE"/>
|
|
||||||
<appender-ref ref="FILE"/>
|
|
||||||
</root>
|
|
||||||
|
|
||||||
</log4j:configuration>
|
|
||||||
|
|||||||
@ -24,7 +24,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.apache.cloudstack</groupId>
|
<groupId>org.apache.cloudstack</groupId>
|
||||||
<artifactId>cloudstack</artifactId>
|
<artifactId>cloudstack</artifactId>
|
||||||
<version>4.19.4.0-SNAPSHOT</version>
|
<version>4.20.3.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -16,28 +16,6 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.agent;
|
package com.cloud.agent;
|
||||||
|
|
||||||
import com.cloud.agent.Agent.ExitStatus;
|
|
||||||
import com.cloud.agent.dao.StorageComponent;
|
|
||||||
import com.cloud.agent.dao.impl.PropertiesStorage;
|
|
||||||
import com.cloud.agent.properties.AgentProperties;
|
|
||||||
import com.cloud.agent.properties.AgentPropertiesFileHandler;
|
|
||||||
import com.cloud.resource.ServerResource;
|
|
||||||
import com.cloud.utils.LogUtils;
|
|
||||||
import com.cloud.utils.ProcessUtil;
|
|
||||||
import com.cloud.utils.PropertiesUtil;
|
|
||||||
import com.cloud.utils.backoff.BackoffAlgorithm;
|
|
||||||
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
|
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
|
||||||
import org.apache.commons.daemon.Daemon;
|
|
||||||
import org.apache.commons.daemon.DaemonContext;
|
|
||||||
import org.apache.commons.daemon.DaemonInitException;
|
|
||||||
import org.apache.commons.lang.math.NumberUtils;
|
|
||||||
import org.apache.commons.lang3.BooleanUtils;
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
import org.apache.log4j.xml.DOMConfigurator;
|
|
||||||
|
|
||||||
import javax.naming.ConfigurationException;
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileNotFoundException;
|
import java.io.FileNotFoundException;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@ -52,8 +30,33 @@ import java.util.Map;
|
|||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import javax.naming.ConfigurationException;
|
||||||
|
|
||||||
|
import org.apache.commons.daemon.Daemon;
|
||||||
|
import org.apache.commons.daemon.DaemonContext;
|
||||||
|
import org.apache.commons.daemon.DaemonInitException;
|
||||||
|
import org.apache.commons.lang.math.NumberUtils;
|
||||||
|
import org.apache.commons.lang3.BooleanUtils;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.core.config.Configurator;
|
||||||
|
|
||||||
|
import com.cloud.agent.Agent.ExitStatus;
|
||||||
|
import com.cloud.agent.dao.StorageComponent;
|
||||||
|
import com.cloud.agent.dao.impl.PropertiesStorage;
|
||||||
|
import com.cloud.agent.properties.AgentProperties;
|
||||||
|
import com.cloud.agent.properties.AgentPropertiesFileHandler;
|
||||||
|
import com.cloud.resource.ServerResource;
|
||||||
|
import com.cloud.utils.LogUtils;
|
||||||
|
import com.cloud.utils.ProcessUtil;
|
||||||
|
import com.cloud.utils.PropertiesUtil;
|
||||||
|
import com.cloud.utils.backoff.BackoffAlgorithm;
|
||||||
|
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
|
||||||
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
public class AgentShell implements IAgentShell, Daemon {
|
public class AgentShell implements IAgentShell, Daemon {
|
||||||
private static final Logger s_logger = Logger.getLogger(AgentShell.class.getName());
|
protected static Logger LOGGER = LogManager.getLogger(AgentShell.class);
|
||||||
|
|
||||||
private final Properties _properties = new Properties();
|
private final Properties _properties = new Properties();
|
||||||
private final Map<String, Object> _cmdLineProperties = new HashMap<String, Object>();
|
private final Map<String, Object> _cmdLineProperties = new HashMap<String, Object>();
|
||||||
@ -221,7 +224,7 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
throw new ConfigurationException("Unable to find agent.properties.");
|
throw new ConfigurationException("Unable to find agent.properties.");
|
||||||
}
|
}
|
||||||
|
|
||||||
s_logger.info("agent.properties found at " + file.getAbsolutePath());
|
LOGGER.info("agent.properties found at {}", file.getAbsolutePath());
|
||||||
|
|
||||||
try {
|
try {
|
||||||
PropertiesUtil.loadFromFile(_properties, file);
|
PropertiesUtil.loadFromFile(_properties, file);
|
||||||
@ -349,7 +352,7 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void init(DaemonContext dc) throws DaemonInitException {
|
public void init(DaemonContext dc) throws DaemonInitException {
|
||||||
s_logger.debug("Initializing AgentShell from JSVC");
|
LOGGER.debug("Initializing AgentShell from JSVC");
|
||||||
try {
|
try {
|
||||||
init(dc.getArguments());
|
init(dc.getArguments());
|
||||||
} catch (ConfigurationException ex) {
|
} catch (ConfigurationException ex) {
|
||||||
@ -369,11 +372,11 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (null != file) {
|
if (null != file) {
|
||||||
DOMConfigurator.configureAndWatch(file.getAbsolutePath());
|
Configurator.initialize(null, file.getAbsolutePath());
|
||||||
|
|
||||||
s_logger.info("Agent started");
|
LOGGER.info("Agent started");
|
||||||
} else {
|
} else {
|
||||||
s_logger.error("Could not start the Agent because the absolute path of the \"log4j-cloud.xml\" file cannot be determined.");
|
LOGGER.error("Could not start the Agent because the absolute path of the \"log4j-cloud.xml\" file cannot be determined.");
|
||||||
}
|
}
|
||||||
|
|
||||||
final Class<?> c = this.getClass();
|
final Class<?> c = this.getClass();
|
||||||
@ -381,19 +384,19 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
if (_version == null) {
|
if (_version == null) {
|
||||||
throw new CloudRuntimeException("Unable to find the implementation version of this agent");
|
throw new CloudRuntimeException("Unable to find the implementation version of this agent");
|
||||||
}
|
}
|
||||||
s_logger.info("Implementation Version is " + _version);
|
LOGGER.info("Implementation Version is {}", _version);
|
||||||
|
|
||||||
loadProperties();
|
loadProperties();
|
||||||
parseCommand(args);
|
parseCommand(args);
|
||||||
|
|
||||||
if (s_logger.isDebugEnabled()) {
|
if (LOGGER.isDebugEnabled()) {
|
||||||
List<String> properties = Collections.list((Enumeration<String>)_properties.propertyNames());
|
List<String> properties = Collections.list((Enumeration<String>)_properties.propertyNames());
|
||||||
for (String property : properties) {
|
for (String property : properties) {
|
||||||
s_logger.debug("Found property: " + property);
|
LOGGER.debug("Found property: {}", property);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
s_logger.info("Defaulting to using properties file for storage");
|
LOGGER.info("Defaulting to using properties file for storage");
|
||||||
_storage = new PropertiesStorage();
|
_storage = new PropertiesStorage();
|
||||||
_storage.configure("Storage", new HashMap<String, Object>());
|
_storage.configure("Storage", new HashMap<String, Object>());
|
||||||
|
|
||||||
@ -403,14 +406,16 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
_properties.put(cmdLineProp.getKey(), cmdLineProp.getValue());
|
_properties.put(cmdLineProp.getKey(), cmdLineProp.getValue());
|
||||||
}
|
}
|
||||||
|
|
||||||
s_logger.info("Defaulting to the constant time backoff algorithm");
|
LOGGER.info("Defaulting to the constant time backoff algorithm");
|
||||||
_backoff = new ConstantTimeBackoff();
|
_backoff = new ConstantTimeBackoff();
|
||||||
_backoff.configure("ConstantTimeBackoff", new HashMap<String, Object>());
|
Map<String, Object> map = new HashMap<>();
|
||||||
|
map.put("seconds", _properties.getProperty("backoff.seconds"));
|
||||||
|
_backoff.configure("ConstantTimeBackoff", map);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void launchAgent() throws ConfigurationException {
|
private void launchAgent() throws ConfigurationException {
|
||||||
String resourceClassNames = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.RESOURCE);
|
String resourceClassNames = AgentPropertiesFileHandler.getPropertyValue(AgentProperties.RESOURCE);
|
||||||
s_logger.trace("resource=" + resourceClassNames);
|
LOGGER.trace("resource={}", resourceClassNames);
|
||||||
if (resourceClassNames != null) {
|
if (resourceClassNames != null) {
|
||||||
launchAgentFromClassInfo(resourceClassNames);
|
launchAgentFromClassInfo(resourceClassNames);
|
||||||
return;
|
return;
|
||||||
@ -440,10 +445,10 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
private void launchAgentFromTypeInfo() throws ConfigurationException {
|
private void launchAgentFromTypeInfo() throws ConfigurationException {
|
||||||
String typeInfo = getProperty(null, "type");
|
String typeInfo = getProperty(null, "type");
|
||||||
if (typeInfo == null) {
|
if (typeInfo == null) {
|
||||||
s_logger.error("Unable to retrieve the type");
|
LOGGER.error("Unable to retrieve the type");
|
||||||
throw new ConfigurationException("Unable to retrieve the type of this agent.");
|
throw new ConfigurationException("Unable to retrieve the type of this agent.");
|
||||||
}
|
}
|
||||||
s_logger.trace("Launching agent based on type=" + typeInfo);
|
LOGGER.trace("Launching agent based on type={}", typeInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void launchNewAgent(ServerResource resource) throws ConfigurationException {
|
public void launchNewAgent(ServerResource resource) throws ConfigurationException {
|
||||||
@ -454,6 +459,11 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
agent.start();
|
agent.start();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Integer getSslHandshakeTimeout() {
|
||||||
|
return AgentPropertiesFileHandler.getPropertyValue(AgentProperties.SSL_HANDSHAKE_TIMEOUT);
|
||||||
|
}
|
||||||
|
|
||||||
public synchronized int getNextAgentId() {
|
public synchronized int getNextAgentId() {
|
||||||
return _nextAgentId++;
|
return _nextAgentId++;
|
||||||
}
|
}
|
||||||
@ -477,17 +487,17 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (ipv6disabled) {
|
if (ipv6disabled) {
|
||||||
s_logger.info("Preferring IPv4 address family for agent connection");
|
LOGGER.info("Preferring IPv4 address family for agent connection");
|
||||||
System.setProperty("java.net.preferIPv4Stack", "true");
|
System.setProperty("java.net.preferIPv4Stack", "true");
|
||||||
if (ipv6prefer) {
|
if (ipv6prefer) {
|
||||||
s_logger.info("ipv6prefer is set to true, but ipv6disabled is false. Not preferring IPv6 for agent connection");
|
LOGGER.info("ipv6prefer is set to true, but ipv6disabled is false. Not preferring IPv6 for agent connection");
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (ipv6prefer) {
|
if (ipv6prefer) {
|
||||||
s_logger.info("Preferring IPv6 address family for agent connection");
|
LOGGER.info("Preferring IPv6 address family for agent connection");
|
||||||
System.setProperty("java.net.preferIPv6Addresses", "true");
|
System.setProperty("java.net.preferIPv6Addresses", "true");
|
||||||
} else {
|
} else {
|
||||||
s_logger.info("Using default Java settings for IPv6 preference for agent connection");
|
LOGGER.info("Using default Java settings for IPv6 preference for agent connection");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -505,7 +515,7 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
String pidDir = getProperty(null, "piddir");
|
String pidDir = getProperty(null, "piddir");
|
||||||
|
|
||||||
final String run = "agent." + instance + "pid";
|
final String run = "agent." + instance + "pid";
|
||||||
s_logger.debug("Checking to see if " + run + " exists.");
|
LOGGER.debug("Checking to see if {} exists.", run);
|
||||||
ProcessUtil.pidCheck(pidDir, run);
|
ProcessUtil.pidCheck(pidDir, run);
|
||||||
|
|
||||||
launchAgent();
|
launchAgent();
|
||||||
@ -514,11 +524,11 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
while (!_exit)
|
while (!_exit)
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
s_logger.debug("[ignored] AgentShell was interrupted.");
|
LOGGER.debug("[ignored] AgentShell was interrupted.");
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch (final Exception e) {
|
} catch (final Exception e) {
|
||||||
s_logger.error("Unable to start agent: ", e);
|
LOGGER.error("Unable to start agent: ", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -535,7 +545,7 @@ public class AgentShell implements IAgentShell, Daemon {
|
|||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
try {
|
try {
|
||||||
s_logger.debug("Initializing AgentShell from main");
|
LOGGER.debug("Initializing AgentShell from main");
|
||||||
AgentShell shell = new AgentShell();
|
AgentShell shell = new AgentShell();
|
||||||
shell.init(args);
|
shell.init(args);
|
||||||
shell.start();
|
shell.start();
|
||||||
|
|||||||
@ -70,4 +70,6 @@ public interface IAgentShell {
|
|||||||
String getConnectedHost();
|
String getConnectedHost();
|
||||||
|
|
||||||
void launchNewAgent(ServerResource resource) throws ConfigurationException;
|
void launchNewAgent(ServerResource resource) throws ConfigurationException;
|
||||||
|
|
||||||
|
Integer getSslHandshakeTimeout();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,7 +24,8 @@ import java.util.Map;
|
|||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import com.cloud.agent.dao.StorageComponent;
|
import com.cloud.agent.dao.StorageComponent;
|
||||||
import com.cloud.utils.PropertiesUtil;
|
import com.cloud.utils.PropertiesUtil;
|
||||||
@ -36,7 +37,7 @@ import com.cloud.utils.PropertiesUtil;
|
|||||||
* path to the properties _file | String | db/db.properties || * }
|
* path to the properties _file | String | db/db.properties || * }
|
||||||
**/
|
**/
|
||||||
public class PropertiesStorage implements StorageComponent {
|
public class PropertiesStorage implements StorageComponent {
|
||||||
private static final Logger s_logger = Logger.getLogger(PropertiesStorage.class);
|
protected Logger logger = LogManager.getLogger(getClass());
|
||||||
Properties _properties = new Properties();
|
Properties _properties = new Properties();
|
||||||
File _file;
|
File _file;
|
||||||
String _name;
|
String _name;
|
||||||
@ -49,7 +50,7 @@ public class PropertiesStorage implements StorageComponent {
|
|||||||
@Override
|
@Override
|
||||||
public synchronized void persist(String key, String value) {
|
public synchronized void persist(String key, String value) {
|
||||||
if (!loadFromFile(_file)) {
|
if (!loadFromFile(_file)) {
|
||||||
s_logger.error("Failed to load changes and then write to them");
|
logger.error("Failed to load changes and then write to them");
|
||||||
}
|
}
|
||||||
_properties.setProperty(key, value);
|
_properties.setProperty(key, value);
|
||||||
FileOutputStream output = null;
|
FileOutputStream output = null;
|
||||||
@ -59,7 +60,7 @@ public class PropertiesStorage implements StorageComponent {
|
|||||||
output.flush();
|
output.flush();
|
||||||
output.close();
|
output.close();
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.error("Uh-oh: ", e);
|
logger.error("Uh-oh: ", e);
|
||||||
} finally {
|
} finally {
|
||||||
IOUtils.closeQuietly(output);
|
IOUtils.closeQuietly(output);
|
||||||
}
|
}
|
||||||
@ -70,10 +71,10 @@ public class PropertiesStorage implements StorageComponent {
|
|||||||
PropertiesUtil.loadFromFile(_properties, file);
|
PropertiesUtil.loadFromFile(_properties, file);
|
||||||
_file = file;
|
_file = file;
|
||||||
} catch (FileNotFoundException e) {
|
} catch (FileNotFoundException e) {
|
||||||
s_logger.error("How did we get here? ", e);
|
logger.error("How did we get here? ", e);
|
||||||
return false;
|
return false;
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.error("IOException: ", e);
|
logger.error("IOException: ", e);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -92,14 +93,12 @@ public class PropertiesStorage implements StorageComponent {
|
|||||||
file = new File(path);
|
file = new File(path);
|
||||||
try {
|
try {
|
||||||
if (!file.createNewFile()) {
|
if (!file.createNewFile()) {
|
||||||
s_logger.error(String.format("Unable to create _file: %s", file.getAbsolutePath()));
|
logger.error("Unable to create _file: {}", file.getAbsolutePath());
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.error(String.format("Unable to create file: %s", file.getAbsolutePath()));
|
logger.error("Unable to create file: {}", file.getAbsolutePath());
|
||||||
if (s_logger.isDebugEnabled()) {
|
logger.debug("IOException while trying to create file: {}", file.getAbsolutePath(), e);
|
||||||
s_logger.debug(String.format("IOException while trying to create file: %s", file.getAbsolutePath()), e);
|
|
||||||
}
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,12 +25,13 @@ import java.util.concurrent.LinkedBlockingQueue;
|
|||||||
import java.util.concurrent.ThreadPoolExecutor;
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
|
|
||||||
import com.cloud.utils.concurrency.NamedThreadFactory;
|
import com.cloud.utils.concurrency.NamedThreadFactory;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
public class DhcpProtocolParserServer extends Thread {
|
public class DhcpProtocolParserServer extends Thread {
|
||||||
private static final Logger s_logger = Logger.getLogger(DhcpProtocolParserServer.class);;
|
protected Logger logger = LogManager.getLogger(DhcpProtocolParserServer.class);;
|
||||||
protected ExecutorService _executor;
|
protected ExecutorService _executor;
|
||||||
private int dhcpServerPort = 67;
|
private int dhcpServerPort = 67;
|
||||||
private int bufferSize = 300;
|
private int bufferSize = 300;
|
||||||
@ -54,7 +55,7 @@ public class DhcpProtocolParserServer extends Thread {
|
|||||||
dhcpSocket.receive(dgp);
|
dhcpSocket.receive(dgp);
|
||||||
}
|
}
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.debug(e.getMessage());
|
logger.debug(e.getMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,14 +22,15 @@ import java.util.Map;
|
|||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import com.cloud.agent.api.to.VirtualMachineTO;
|
import com.cloud.agent.api.to.VirtualMachineTO;
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
import com.cloud.vm.VirtualMachine.State;
|
import com.cloud.vm.VirtualMachine.State;
|
||||||
|
|
||||||
public class MockVmMgr implements VmMgr {
|
public class MockVmMgr implements VmMgr {
|
||||||
private static final Logger s_logger = Logger.getLogger(MockVmMgr.class);
|
protected Logger logger = LogManager.getLogger(getClass());
|
||||||
|
|
||||||
private static final int DEFAULT_DOM0_MEM_MB = 128;
|
private static final int DEFAULT_DOM0_MEM_MB = 128;
|
||||||
private static final Random randSeed = new Random();
|
private static final Random randSeed = new Random();
|
||||||
@ -56,14 +57,14 @@ public class MockVmMgr implements VmMgr {
|
|||||||
public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP,
|
public String startVM(String vmName, String vnetId, String gateway, String dns, String privateIP, String privateMac, String privateMask, String publicIP,
|
||||||
String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) {
|
String publicMac, String publicMask, int cpuCount, int cpuUtilization, long ramSize, String localPath, String vncPassword) {
|
||||||
|
|
||||||
if (s_logger.isInfoEnabled()) {
|
if (logger.isInfoEnabled()) {
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
sb.append("Start VM. name: " + vmName + ", vnet: " + vnetId + ", dns: " + dns);
|
sb.append("Start VM. name: " + vmName + ", vnet: " + vnetId + ", dns: " + dns);
|
||||||
sb.append(", privateIP: " + privateIP + ", privateMac: " + privateMac + ", privateMask: " + privateMask);
|
sb.append(", privateIP: " + privateIP + ", privateMac: " + privateMac + ", privateMask: " + privateMask);
|
||||||
sb.append(", publicIP: " + publicIP + ", publicMac: " + publicMac + ", publicMask: " + publicMask);
|
sb.append(", publicIP: " + publicIP + ", publicMac: " + publicMac + ", publicMask: " + publicMask);
|
||||||
sb.append(", cpu count: " + cpuCount + ", cpuUtilization: " + cpuUtilization + ", ram : " + ramSize);
|
sb.append(", cpu count: " + cpuCount + ", cpuUtilization: " + cpuUtilization + ", ram : " + ramSize);
|
||||||
sb.append(", localPath: " + localPath);
|
sb.append(", localPath: " + localPath);
|
||||||
s_logger.info(sb.toString());
|
logger.info(sb.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
@ -86,8 +87,7 @@ public class MockVmMgr implements VmMgr {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String stopVM(String vmName, boolean force) {
|
public String stopVM(String vmName, boolean force) {
|
||||||
if (s_logger.isInfoEnabled())
|
logger.info("Stop VM. name: {}", vmName);
|
||||||
s_logger.info("Stop VM. name: " + vmName);
|
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
MockVm vm = vms.get(vmName);
|
MockVm vm = vms.get(vmName);
|
||||||
@ -102,8 +102,7 @@ public class MockVmMgr implements VmMgr {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String rebootVM(String vmName) {
|
public String rebootVM(String vmName) {
|
||||||
if (s_logger.isInfoEnabled())
|
logger.info("Reboot VM. name: {}", vmName);
|
||||||
s_logger.info("Reboot VM. name: " + vmName);
|
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
MockVm vm = vms.get(vmName);
|
MockVm vm = vms.get(vmName);
|
||||||
@ -115,8 +114,7 @@ public class MockVmMgr implements VmMgr {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean migrate(String vmName, String params) {
|
public boolean migrate(String vmName, String params) {
|
||||||
if (s_logger.isInfoEnabled())
|
logger.info("Migrate VM. name: {}", vmName);
|
||||||
s_logger.info("Migrate VM. name: " + vmName);
|
|
||||||
|
|
||||||
synchronized (this) {
|
synchronized (this) {
|
||||||
MockVm vm = vms.get(vmName);
|
MockVm vm = vms.get(vmName);
|
||||||
@ -258,13 +256,13 @@ public class MockVmMgr implements VmMgr {
|
|||||||
vm = vms.get(vmName);
|
vm = vms.get(vmName);
|
||||||
if (vm == null) {
|
if (vm == null) {
|
||||||
if (ramSize > getHostFreeMemory()) {
|
if (ramSize > getHostFreeMemory()) {
|
||||||
s_logger.debug("host is out of memory");
|
logger.debug("host is out of memory");
|
||||||
throw new CloudRuntimeException("Host is out of Memory");
|
throw new CloudRuntimeException("Host is out of Memory");
|
||||||
}
|
}
|
||||||
|
|
||||||
int vncPort = allocVncPort();
|
int vncPort = allocVncPort();
|
||||||
if (vncPort < 0) {
|
if (vncPort < 0) {
|
||||||
s_logger.debug("Unable to allocate VNC port");
|
logger.debug("Unable to allocate VNC port");
|
||||||
throw new CloudRuntimeException("Unable to allocate vnc port");
|
throw new CloudRuntimeException("Unable to allocate vnc port");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -516,6 +516,7 @@ public class AgentProperties{
|
|||||||
/**
|
/**
|
||||||
* The model of Watchdog timer to present to the Guest.<br>
|
* The model of Watchdog timer to present to the Guest.<br>
|
||||||
* For all models refer to the libvirt documentation.<br>
|
* For all models refer to the libvirt documentation.<br>
|
||||||
|
* PLEASE NOTE: to disable the watchdogs definitions, use value: none
|
||||||
* Data type: String.<br>
|
* Data type: String.<br>
|
||||||
* Default value: <code>i6300esb</code>
|
* Default value: <code>i6300esb</code>
|
||||||
*/
|
*/
|
||||||
@ -803,12 +804,26 @@ public class AgentProperties{
|
|||||||
*/
|
*/
|
||||||
public static final Property<String> KEYSTORE_PASSPHRASE = new Property<>(KeyStoreUtils.KS_PASSPHRASE_PROPERTY, null, String.class);
|
public static final Property<String> KEYSTORE_PASSPHRASE = new Property<>(KeyStoreUtils.KS_PASSPHRASE_PROPERTY, null, String.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Implicit host tags
|
||||||
|
* Data type: String.<br>
|
||||||
|
* Default value: <code>null</code>
|
||||||
|
*/
|
||||||
|
public static final Property<String> HOST_TAGS = new Property<>("host.tags", null, String.class);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Timeout for SSL handshake in seconds
|
||||||
|
* Data type: Integer.<br>
|
||||||
|
* Default value: <code>null</code>
|
||||||
|
*/
|
||||||
|
public static final Property<Integer> SSL_HANDSHAKE_TIMEOUT = new Property<>("ssl.handshake.timeout", null, Integer.class);
|
||||||
|
|
||||||
public static class Property <T>{
|
public static class Property <T>{
|
||||||
private String name;
|
private String name;
|
||||||
private T defaultValue;
|
private T defaultValue;
|
||||||
private Class<T> typeClass;
|
private Class<T> typeClass;
|
||||||
|
|
||||||
Property(String name, T value) {
|
public Property(String name, T value) {
|
||||||
init(name, value);
|
init(name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -22,7 +22,8 @@ import org.apache.commons.beanutils.ConvertUtils;
|
|||||||
import org.apache.commons.beanutils.converters.IntegerConverter;
|
import org.apache.commons.beanutils.converters.IntegerConverter;
|
||||||
import org.apache.commons.beanutils.converters.LongConverter;
|
import org.apache.commons.beanutils.converters.LongConverter;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This class provides a facility to read the agent's properties file and get
|
* This class provides a facility to read the agent's properties file and get
|
||||||
@ -31,7 +32,7 @@ import org.apache.log4j.Logger;
|
|||||||
*/
|
*/
|
||||||
public class AgentPropertiesFileHandler {
|
public class AgentPropertiesFileHandler {
|
||||||
|
|
||||||
private static final Logger logger = Logger.getLogger(AgentPropertiesFileHandler.class);
|
protected static Logger LOGGER = LogManager.getLogger(AgentPropertiesFileHandler.class);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method reads the property in the agent.properties file.
|
* This method reads the property in the agent.properties file.
|
||||||
@ -47,7 +48,7 @@ public class AgentPropertiesFileHandler {
|
|||||||
File agentPropertiesFile = PropertiesUtil.findConfigFile(KeyStoreUtils.AGENT_PROPSFILE);
|
File agentPropertiesFile = PropertiesUtil.findConfigFile(KeyStoreUtils.AGENT_PROPSFILE);
|
||||||
|
|
||||||
if (agentPropertiesFile == null) {
|
if (agentPropertiesFile == null) {
|
||||||
logger.debug(String.format("File [%s] was not found, we will use default defined values. Property [%s]: [%s].", KeyStoreUtils.AGENT_PROPSFILE, name, defaultValue));
|
LOGGER.debug("File [{}] was not found, we will use default defined values. Property [{}]: [{}].", KeyStoreUtils.AGENT_PROPSFILE, name, defaultValue);
|
||||||
|
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
@ -55,7 +56,7 @@ public class AgentPropertiesFileHandler {
|
|||||||
try {
|
try {
|
||||||
String configValue = PropertiesUtil.loadFromFile(agentPropertiesFile).getProperty(name);
|
String configValue = PropertiesUtil.loadFromFile(agentPropertiesFile).getProperty(name);
|
||||||
if (StringUtils.isBlank(configValue)) {
|
if (StringUtils.isBlank(configValue)) {
|
||||||
logger.debug(String.format("Property [%s] has empty or null value. Using default value [%s].", name, defaultValue));
|
LOGGER.debug("Property [{}] has empty or null value. Using default value [{}].", name, defaultValue);
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,11 +68,11 @@ public class AgentPropertiesFileHandler {
|
|||||||
ConvertUtils.register(new LongConverter(defaultValue), Long.class);
|
ConvertUtils.register(new LongConverter(defaultValue), Long.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.debug(String.format("Property [%s] was altered. Now using the value [%s].", name, configValue));
|
LOGGER.debug("Property [{}] was altered. Now using the value [{}].", name, configValue);
|
||||||
return (T)ConvertUtils.convert(configValue, property.getTypeClass());
|
return (T)ConvertUtils.convert(configValue, property.getTypeClass());
|
||||||
|
|
||||||
} catch (IOException ex) {
|
} catch (IOException ex) {
|
||||||
logger.debug(String.format("Failed to get property [%s]. Using default value [%s].", name, defaultValue), ex);
|
LOGGER.debug("Failed to get property [{}]. Using default value [{}].", name, defaultValue, ex);
|
||||||
}
|
}
|
||||||
|
|
||||||
return defaultValue;
|
return defaultValue;
|
||||||
|
|||||||
@ -34,7 +34,6 @@ import javax.naming.ConfigurationException;
|
|||||||
|
|
||||||
import com.cloud.agent.api.proxy.AllowConsoleAccessCommand;
|
import com.cloud.agent.api.proxy.AllowConsoleAccessCommand;
|
||||||
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
|
import org.apache.cloudstack.managed.context.ManagedContextRunnable;
|
||||||
import org.apache.log4j.Logger;
|
|
||||||
|
|
||||||
import com.cloud.agent.Agent.ExitStatus;
|
import com.cloud.agent.Agent.ExitStatus;
|
||||||
import com.cloud.agent.api.AgentControlAnswer;
|
import com.cloud.agent.api.AgentControlAnswer;
|
||||||
@ -81,7 +80,6 @@ import com.google.gson.Gson;
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class ConsoleProxyResource extends ServerResourceBase implements ServerResource {
|
public class ConsoleProxyResource extends ServerResourceBase implements ServerResource {
|
||||||
static final Logger s_logger = Logger.getLogger(ConsoleProxyResource.class);
|
|
||||||
|
|
||||||
private final Properties properties = new Properties();
|
private final Properties properties = new Properties();
|
||||||
private Thread consoleProxyMain = null;
|
private Thread consoleProxyMain = null;
|
||||||
@ -101,7 +99,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
} else if (cmd instanceof WatchConsoleProxyLoadCommand) {
|
} else if (cmd instanceof WatchConsoleProxyLoadCommand) {
|
||||||
return execute((WatchConsoleProxyLoadCommand)cmd);
|
return execute((WatchConsoleProxyLoadCommand)cmd);
|
||||||
} else if (cmd instanceof ReadyCommand) {
|
} else if (cmd instanceof ReadyCommand) {
|
||||||
s_logger.info("Receive ReadyCommand, response with ReadyAnswer");
|
logger.info("Receive ReadyCommand, response with ReadyAnswer");
|
||||||
return new ReadyAnswer((ReadyCommand)cmd);
|
return new ReadyAnswer((ReadyCommand)cmd);
|
||||||
} else if (cmd instanceof CheckHealthCommand) {
|
} else if (cmd instanceof CheckHealthCommand) {
|
||||||
return new CheckHealthAnswer((CheckHealthCommand)cmd, true);
|
return new CheckHealthAnswer((CheckHealthCommand)cmd, true);
|
||||||
@ -123,13 +121,13 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
return new Answer(cmd);
|
return new Answer(cmd);
|
||||||
} catch (SecurityException | NoSuchMethodException | ClassNotFoundException | InvocationTargetException | IllegalAccessException e) {
|
} catch (SecurityException | NoSuchMethodException | ClassNotFoundException | InvocationTargetException | IllegalAccessException e) {
|
||||||
String errorMsg = "Unable to add allowed session due to: " + e.getMessage();
|
String errorMsg = "Unable to add allowed session due to: " + e.getMessage();
|
||||||
s_logger.error(errorMsg, e);
|
logger.error(errorMsg, e);
|
||||||
return new Answer(cmd, false, errorMsg);
|
return new Answer(cmd, false, errorMsg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private Answer execute(StartConsoleProxyAgentHttpHandlerCommand cmd) {
|
private Answer execute(StartConsoleProxyAgentHttpHandlerCommand cmd) {
|
||||||
s_logger.info("Invoke launchConsoleProxy() in responding to StartConsoleProxyAgentHttpHandlerCommand");
|
logger.info("Invoke launchConsoleProxy() in responding to StartConsoleProxyAgentHttpHandlerCommand");
|
||||||
launchConsoleProxy(cmd.getKeystoreBits(), cmd.getKeystorePassword(), cmd.getEncryptorPassword(), cmd.isSourceIpCheckEnabled());
|
launchConsoleProxy(cmd.getKeystoreBits(), cmd.getKeystorePassword(), cmd.getEncryptorPassword(), cmd.isSourceIpCheckEnabled());
|
||||||
return new Answer(cmd);
|
return new Answer(cmd);
|
||||||
}
|
}
|
||||||
@ -140,7 +138,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
{
|
{
|
||||||
out.write("0");
|
out.write("0");
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.warn("Unable to disable rp_filter");
|
logger.warn("Unable to disable rp_filter");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -177,12 +175,12 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
try {
|
try {
|
||||||
is.close();
|
is.close();
|
||||||
} catch (final IOException e) {
|
} catch (final IOException e) {
|
||||||
s_logger.warn("Exception when closing , console proxy address : " + proxyManagementIp);
|
logger.warn("Exception when closing , console proxy address : {}", proxyManagementIp);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (final IOException e) {
|
} catch (final IOException e) {
|
||||||
s_logger.warn("Unable to open console proxy command port url, console proxy address : " + proxyManagementIp);
|
logger.warn("Unable to open console proxy command port url, console proxy address : {}", proxyManagementIp);
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -227,14 +225,14 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
if (eth1Ip != null) {
|
if (eth1Ip != null) {
|
||||||
params.put("private.network.device", "eth1");
|
params.put("private.network.device", "eth1");
|
||||||
} else {
|
} else {
|
||||||
s_logger.info("eth1ip parameter has not been configured, assuming that we are not inside a system vm");
|
logger.info("eth1ip parameter has not been configured, assuming that we are not inside a system vm");
|
||||||
}
|
}
|
||||||
|
|
||||||
String eth2ip = (String)params.get("eth2ip");
|
String eth2ip = (String)params.get("eth2ip");
|
||||||
if (eth2ip != null) {
|
if (eth2ip != null) {
|
||||||
params.put("public.network.device", "eth2");
|
params.put("public.network.device", "eth2");
|
||||||
} else {
|
} else {
|
||||||
s_logger.info("eth2ip parameter is not found, assuming that we are not inside a system vm");
|
logger.info("eth2ip parameter is not found, assuming that we are not inside a system vm");
|
||||||
}
|
}
|
||||||
|
|
||||||
super.configure(name, params);
|
super.configure(name, params);
|
||||||
@ -262,7 +260,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
}
|
}
|
||||||
String internalDns1 = (String) params.get("internaldns1");
|
String internalDns1 = (String) params.get("internaldns1");
|
||||||
if (internalDns1 == null) {
|
if (internalDns1 == null) {
|
||||||
s_logger.warn("No DNS entry found during configuration of ConsoleProxy");
|
logger.warn("No DNS entry found during configuration of ConsoleProxy");
|
||||||
} else {
|
} else {
|
||||||
addRouteToInternalIpOrCidr(localGateway, eth1Ip, eth1Mask, internalDns1);
|
addRouteToInternalIpOrCidr(localGateway, eth1Ip, eth1Mask, internalDns1);
|
||||||
}
|
}
|
||||||
@ -280,20 +278,19 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
disableRpFilter();
|
disableRpFilter();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (s_logger.isInfoEnabled())
|
logger.info("Receive proxyVmId in ConsoleProxyResource configuration as {}", proxyVmId);
|
||||||
s_logger.info("Receive proxyVmId in ConsoleProxyResource configuration as " + proxyVmId);
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addRouteToInternalIpOrCidr(String localgw, String eth1ip, String eth1mask, String destIpOrCidr) {
|
private void addRouteToInternalIpOrCidr(String localgw, String eth1ip, String eth1mask, String destIpOrCidr) {
|
||||||
s_logger.debug("addRouteToInternalIp: localgw=" + localgw + ", eth1ip=" + eth1ip + ", eth1mask=" + eth1mask + ",destIp=" + destIpOrCidr);
|
logger.debug("addRouteToInternalIp: localgw={}, eth1ip={}, eth1mask={}, destIp={}", localgw, eth1ip, eth1mask, destIpOrCidr);
|
||||||
if (destIpOrCidr == null) {
|
if (destIpOrCidr == null) {
|
||||||
s_logger.debug("addRouteToInternalIp: destIp is null");
|
logger.debug("addRouteToInternalIp: destIp is null");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!NetUtils.isValidIp4(destIpOrCidr) && !NetUtils.isValidIp4Cidr(destIpOrCidr)) {
|
if (!NetUtils.isValidIp4(destIpOrCidr) && !NetUtils.isValidIp4Cidr(destIpOrCidr)) {
|
||||||
s_logger.warn(" destIp is not a valid ip address or cidr destIp=" + destIpOrCidr);
|
logger.warn(" destIp is not a valid ip address or cidr destIp={}", destIpOrCidr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
boolean inSameSubnet = false;
|
boolean inSameSubnet = false;
|
||||||
@ -301,27 +298,27 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
if (eth1ip != null && eth1mask != null) {
|
if (eth1ip != null && eth1mask != null) {
|
||||||
inSameSubnet = NetUtils.sameSubnet(eth1ip, destIpOrCidr, eth1mask);
|
inSameSubnet = NetUtils.sameSubnet(eth1ip, destIpOrCidr, eth1mask);
|
||||||
} else {
|
} else {
|
||||||
s_logger.warn("addRouteToInternalIp: unable to determine same subnet: eth1ip=" + eth1ip + ", dest ip=" + destIpOrCidr + ", eth1mask=" + eth1mask);
|
logger.warn("addRouteToInternalIp: unable to determine same subnet: eth1ip={}, dest ip={}, eth1mask={}", eth1ip, destIpOrCidr, eth1mask);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
inSameSubnet = NetUtils.isNetworkAWithinNetworkB(destIpOrCidr, NetUtils.ipAndNetMaskToCidr(eth1ip, eth1mask));
|
inSameSubnet = NetUtils.isNetworkAWithinNetworkB(destIpOrCidr, NetUtils.ipAndNetMaskToCidr(eth1ip, eth1mask));
|
||||||
}
|
}
|
||||||
if (inSameSubnet) {
|
if (inSameSubnet) {
|
||||||
s_logger.debug("addRouteToInternalIp: dest ip " + destIpOrCidr + " is in the same subnet as eth1 ip " + eth1ip);
|
logger.debug("addRouteToInternalIp: dest ip {} is in the same subnet as eth1 ip {}", destIpOrCidr, eth1ip);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Script command = new Script("/bin/bash", s_logger);
|
Script command = new Script("/bin/bash", logger);
|
||||||
command.add("-c");
|
command.add("-c");
|
||||||
command.add("ip route delete " + destIpOrCidr);
|
command.add("ip route delete " + destIpOrCidr);
|
||||||
command.execute();
|
command.execute();
|
||||||
command = new Script("/bin/bash", s_logger);
|
command = new Script("/bin/bash", logger);
|
||||||
command.add("-c");
|
command.add("-c");
|
||||||
command.add("ip route add " + destIpOrCidr + " via " + localgw);
|
command.add("ip route add " + destIpOrCidr + " via " + localgw);
|
||||||
String result = command.execute();
|
String result = command.execute();
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
s_logger.warn("Error in configuring route to internal ip err=" + result);
|
logger.warn("Error in configuring route to internal ip err={}", result);
|
||||||
} else {
|
} else {
|
||||||
s_logger.debug("addRouteToInternalIp: added route to internal ip=" + destIpOrCidr + " via " + localgw);
|
logger.debug("addRouteToInternalIp: added route to internal ip={} via {}", destIpOrCidr, localgw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -332,36 +329,36 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
|
|
||||||
private void launchConsoleProxy(final byte[] ksBits, final String ksPassword, final String encryptorPassword, final Boolean isSourceIpCheckEnabled) {
|
private void launchConsoleProxy(final byte[] ksBits, final String ksPassword, final String encryptorPassword, final Boolean isSourceIpCheckEnabled) {
|
||||||
final Object resource = this;
|
final Object resource = this;
|
||||||
s_logger.info("Building class loader for com.cloud.consoleproxy.ConsoleProxy");
|
logger.info("Building class loader for com.cloud.consoleproxy.ConsoleProxy");
|
||||||
if (consoleProxyMain == null) {
|
if (consoleProxyMain == null) {
|
||||||
s_logger.info("Running com.cloud.consoleproxy.ConsoleProxy with encryptor password=" + encryptorPassword);
|
logger.info("Running com.cloud.consoleproxy.ConsoleProxy with encryptor password={}", encryptorPassword);
|
||||||
consoleProxyMain = new Thread(new ManagedContextRunnable() {
|
consoleProxyMain = new Thread(new ManagedContextRunnable() {
|
||||||
@Override
|
@Override
|
||||||
protected void runInContext() {
|
protected void runInContext() {
|
||||||
try {
|
try {
|
||||||
Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
|
Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
|
||||||
try {
|
try {
|
||||||
s_logger.info("Invoke startWithContext()");
|
logger.info("Invoke startWithContext()");
|
||||||
Method method = consoleProxyClazz.getMethod("startWithContext", Properties.class, Object.class, byte[].class, String.class, String.class, Boolean.class);
|
Method method = consoleProxyClazz.getMethod("startWithContext", Properties.class, Object.class, byte[].class, String.class, String.class, Boolean.class);
|
||||||
method.invoke(null, properties, resource, ksBits, ksPassword, encryptorPassword, isSourceIpCheckEnabled);
|
method.invoke(null, properties, resource, ksBits, ksPassword, encryptorPassword, isSourceIpCheckEnabled);
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to SecurityException", e);
|
logger.error("Unable to launch console proxy due to SecurityException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (NoSuchMethodException e) {
|
} catch (NoSuchMethodException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
|
logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
|
logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (IllegalAccessException e) {
|
} catch (IllegalAccessException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to IllegalAccessException", e);
|
logger.error("Unable to launch console proxy due to IllegalAccessException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (InvocationTargetException e) {
|
} catch (InvocationTargetException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to InvocationTargetException " + e.getTargetException().toString(), e);
|
logger.error("Unable to launch console proxy due to InvocationTargetException {}", e.getTargetException().toString(), e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
}
|
}
|
||||||
} catch (final ClassNotFoundException e) {
|
} catch (final ClassNotFoundException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to ClassNotFoundException");
|
logger.error("Unable to launch console proxy due to ClassNotFoundException");
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -369,7 +366,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
consoleProxyMain.setDaemon(true);
|
consoleProxyMain.setDaemon(true);
|
||||||
consoleProxyMain.start();
|
consoleProxyMain.start();
|
||||||
} else {
|
} else {
|
||||||
s_logger.info("com.cloud.consoleproxy.ConsoleProxy is already running");
|
logger.info("com.cloud.consoleproxy.ConsoleProxy is already running");
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
|
Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
|
||||||
@ -378,22 +375,22 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
methodSetup = consoleProxyClazz.getMethod("setIsSourceIpCheckEnabled", Boolean.class);
|
methodSetup = consoleProxyClazz.getMethod("setIsSourceIpCheckEnabled", Boolean.class);
|
||||||
methodSetup.invoke(null, isSourceIpCheckEnabled);
|
methodSetup.invoke(null, isSourceIpCheckEnabled);
|
||||||
} catch (SecurityException e) {
|
} catch (SecurityException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to SecurityException", e);
|
logger.error("Unable to launch console proxy due to SecurityException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (NoSuchMethodException e) {
|
} catch (NoSuchMethodException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
|
logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (IllegalArgumentException e) {
|
} catch (IllegalArgumentException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
|
logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (IllegalAccessException e) {
|
} catch (IllegalAccessException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to IllegalAccessException", e);
|
logger.error("Unable to launch console proxy due to IllegalAccessException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (InvocationTargetException e) {
|
} catch (InvocationTargetException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to InvocationTargetException " + e.getTargetException().toString(), e);
|
logger.error("Unable to launch console proxy due to InvocationTargetException " + e.getTargetException().toString(), e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
} catch (final ClassNotFoundException e) {
|
} catch (final ClassNotFoundException e) {
|
||||||
s_logger.error("Unable to launch console proxy due to ClassNotFoundException", e);
|
logger.error("Unable to launch console proxy due to ClassNotFoundException", e);
|
||||||
System.exit(ExitStatus.Error.value());
|
System.exit(ExitStatus.Error.value());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -420,10 +417,10 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
result.setTunnelUrl(authAnswer.getTunnelUrl());
|
result.setTunnelUrl(authAnswer.getTunnelUrl());
|
||||||
result.setTunnelSession(authAnswer.getTunnelSession());
|
result.setTunnelSession(authAnswer.getTunnelSession());
|
||||||
} else {
|
} else {
|
||||||
s_logger.error("Authentication failed for vm: " + vmId + " with sid: " + sid);
|
logger.error("Authentication failed for vm: {} with sid: {}", vmId, sid);
|
||||||
}
|
}
|
||||||
} catch (AgentControlChannelException e) {
|
} catch (AgentControlChannelException e) {
|
||||||
s_logger.error("Unable to send out console access authentication request due to " + e.getMessage(), e);
|
logger.error("Unable to send out console access authentication request due to {}", e.getMessage(), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Gson().toJson(result);
|
return new Gson().toJson(result);
|
||||||
@ -433,18 +430,15 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
ConsoleProxyLoadReportCommand cmd = new ConsoleProxyLoadReportCommand(proxyVmId, gsonLoadInfo);
|
ConsoleProxyLoadReportCommand cmd = new ConsoleProxyLoadReportCommand(proxyVmId, gsonLoadInfo);
|
||||||
try {
|
try {
|
||||||
getAgentControl().postRequest(cmd);
|
getAgentControl().postRequest(cmd);
|
||||||
|
logger.debug("Report proxy load info, proxy : {}, load: {}", proxyVmId, gsonLoadInfo);
|
||||||
if (s_logger.isDebugEnabled())
|
|
||||||
s_logger.debug("Report proxy load info, proxy : " + proxyVmId + ", load: " + gsonLoadInfo);
|
|
||||||
} catch (AgentControlChannelException e) {
|
} catch (AgentControlChannelException e) {
|
||||||
s_logger.error("Unable to send out load info due to " + e.getMessage(), e);
|
logger.error("Unable to send out load info due to {}", e.getMessage(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ensureRoute(String address) {
|
public void ensureRoute(String address) {
|
||||||
if (localGateway != null) {
|
if (localGateway != null) {
|
||||||
if (s_logger.isDebugEnabled())
|
logger.debug("Ensure route for {} via {}", address, localGateway);
|
||||||
s_logger.debug("Ensure route for " + address + " via " + localGateway);
|
|
||||||
|
|
||||||
// this method won't be called in high frequency, serialize access
|
// this method won't be called in high frequency, serialize access
|
||||||
// to script execution
|
// to script execution
|
||||||
@ -452,7 +446,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe
|
|||||||
try {
|
try {
|
||||||
addRouteToInternalIpOrCidr(localGateway, eth1Ip, eth1Mask, address);
|
addRouteToInternalIpOrCidr(localGateway, eth1Ip, eth1Mask, address);
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
s_logger.warn("Unexpected exception while adding internal route to " + address, e);
|
logger.warn("Unexpected exception while adding internal route to {}", address, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -350,4 +350,23 @@ public class AgentShellTest {
|
|||||||
|
|
||||||
Mockito.verify(agentShellSpy).setHosts(expected);
|
Mockito.verify(agentShellSpy).setHosts(expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void updateAndGetConnectedHost() {
|
||||||
|
String expected = "test";
|
||||||
|
|
||||||
|
AgentShell shell = new AgentShell();
|
||||||
|
shell.setHosts("test");
|
||||||
|
shell.getNextHost();
|
||||||
|
shell.updateConnectedHost();
|
||||||
|
|
||||||
|
Assert.assertEquals(expected, shell.getConnectedHost());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetSslHandshakeTimeout() {
|
||||||
|
Integer expected = 1;
|
||||||
|
agentPropertiesFileHandlerMocked.when(() -> AgentPropertiesFileHandler.getPropertyValue(Mockito.eq(AgentProperties.SSL_HANDSHAKE_TIMEOUT))).thenReturn(expected);
|
||||||
|
Assert.assertEquals(expected, agentShellSpy.getSslHandshakeTimeout());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
257
agent/src/test/java/com/cloud/agent/AgentTest.java
Normal file
257
agent/src/test/java/com/cloud/agent/AgentTest.java
Normal file
@ -0,0 +1,257 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.agent;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertFalse;
|
||||||
|
import static org.junit.Assert.assertNotNull;
|
||||||
|
import static org.junit.Assert.assertSame;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
import static org.mockito.Mockito.any;
|
||||||
|
import static org.mockito.Mockito.doReturn;
|
||||||
|
import static org.mockito.Mockito.doThrow;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.eq;
|
||||||
|
import static org.mockito.Mockito.times;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import java.io.IOException;
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
|
||||||
|
import javax.naming.ConfigurationException;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.junit.MockitoJUnitRunner;
|
||||||
|
import org.springframework.test.util.ReflectionTestUtils;
|
||||||
|
|
||||||
|
import com.cloud.resource.ServerResource;
|
||||||
|
import com.cloud.utils.backoff.impl.ConstantTimeBackoff;
|
||||||
|
import com.cloud.utils.nio.Link;
|
||||||
|
import com.cloud.utils.nio.NioConnection;
|
||||||
|
|
||||||
|
@RunWith(MockitoJUnitRunner.class)
|
||||||
|
public class AgentTest {
|
||||||
|
Agent agent;
|
||||||
|
private AgentShell shell;
|
||||||
|
private ServerResource serverResource;
|
||||||
|
private Logger logger;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() throws ConfigurationException {
|
||||||
|
shell = mock(AgentShell.class);
|
||||||
|
serverResource = mock(ServerResource.class);
|
||||||
|
doReturn(true).when(serverResource).configure(any(), any());
|
||||||
|
doReturn(1).when(shell).getWorkers();
|
||||||
|
doReturn(1).when(shell).getPingRetries();
|
||||||
|
agent = new Agent(shell, 1, serverResource);
|
||||||
|
logger = mock(Logger.class);
|
||||||
|
ReflectionTestUtils.setField(agent, "logger", logger);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetLinkLogNullLinkReturnsEmptyString() {
|
||||||
|
Link link = null;
|
||||||
|
String result = agent.getLinkLog(link);
|
||||||
|
assertEquals("", result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetLinkLogLinkWithTraceEnabledReturnsLinkLogWithHashCode() {
|
||||||
|
Link link = mock(Link.class);
|
||||||
|
InetSocketAddress socketAddress = new InetSocketAddress("192.168.1.100", 1111);
|
||||||
|
when(link.getSocketAddress()).thenReturn(socketAddress);
|
||||||
|
when(logger.isTraceEnabled()).thenReturn(true);
|
||||||
|
|
||||||
|
String result = agent.getLinkLog(link);
|
||||||
|
System.out.println(result);
|
||||||
|
assertTrue(result.startsWith(System.identityHashCode(link) + "-"));
|
||||||
|
assertTrue(result.contains("192.168.1.100"));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetAgentNameWhenServerResourceIsNull() {
|
||||||
|
ReflectionTestUtils.setField(agent, "serverResource", null);
|
||||||
|
assertEquals("Agent", agent.getAgentName());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetAgentNameWhenAppendAgentNameIsTrue() {
|
||||||
|
when(serverResource.isAppendAgentNameToLogs()).thenReturn(true);
|
||||||
|
when(serverResource.getName()).thenReturn("TestAgent");
|
||||||
|
|
||||||
|
String agentName = agent.getAgentName();
|
||||||
|
assertEquals("TestAgent", agentName);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetAgentNameWhenAppendAgentNameIsFalse() {
|
||||||
|
when(serverResource.isAppendAgentNameToLogs()).thenReturn(false);
|
||||||
|
|
||||||
|
String agentName = agent.getAgentName();
|
||||||
|
assertEquals("Agent", agentName);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAgentInitialization() {
|
||||||
|
Runtime.getRuntime().removeShutdownHook(agent.shutdownThread);
|
||||||
|
when(shell.getPingRetries()).thenReturn(3);
|
||||||
|
when(shell.getWorkers()).thenReturn(5);
|
||||||
|
agent.setupShutdownHookAndInitExecutors();
|
||||||
|
assertNotNull(agent.selfTaskExecutor);
|
||||||
|
assertNotNull(agent.outRequestHandler);
|
||||||
|
assertNotNull(agent.requestHandler);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testAgentShutdownHookAdded() {
|
||||||
|
Runtime.getRuntime().removeShutdownHook(agent.shutdownThread);
|
||||||
|
agent.setupShutdownHookAndInitExecutors();
|
||||||
|
verify(logger).trace("Adding shutdown hook");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetResourceGuidValidGuidAndResourceName() {
|
||||||
|
when(shell.getGuid()).thenReturn("12345");
|
||||||
|
String result = agent.getResourceGuid();
|
||||||
|
assertTrue(result.startsWith("12345-" + ServerResource.class.getSimpleName()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetZoneReturnsValidZone() {
|
||||||
|
when(shell.getZone()).thenReturn("ZoneA");
|
||||||
|
String result = agent.getZone();
|
||||||
|
assertEquals("ZoneA", result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetPodReturnsValidPod() {
|
||||||
|
when(shell.getPod()).thenReturn("PodA");
|
||||||
|
String result = agent.getPod();
|
||||||
|
assertEquals("PodA", result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testSetLinkAssignsLink() {
|
||||||
|
Link mockLink = mock(Link.class);
|
||||||
|
agent.setLink(mockLink);
|
||||||
|
assertEquals(mockLink, agent.link);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetResourceReturnsServerResource() {
|
||||||
|
ServerResource mockResource = mock(ServerResource.class);
|
||||||
|
ReflectionTestUtils.setField(agent, "serverResource", mockResource);
|
||||||
|
ServerResource result = agent.getResource();
|
||||||
|
assertSame(mockResource, result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetResourceName() {
|
||||||
|
String result = agent.getResourceName();
|
||||||
|
assertTrue(result.startsWith(ServerResource.class.getSimpleName()));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUpdateLastPingResponseTimeUpdatesCurrentTime() {
|
||||||
|
long beforeUpdate = System.currentTimeMillis();
|
||||||
|
agent.updateLastPingResponseTime();
|
||||||
|
long updatedTime = agent.lastPingResponseTime.get();
|
||||||
|
assertTrue(updatedTime >= beforeUpdate);
|
||||||
|
assertTrue(updatedTime <= System.currentTimeMillis());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testGetNextSequenceIncrementsSequence() {
|
||||||
|
long initialSequence = agent.getNextSequence();
|
||||||
|
long nextSequence = agent.getNextSequence();
|
||||||
|
assertEquals(initialSequence + 1, nextSequence);
|
||||||
|
long thirdSequence = agent.getNextSequence();
|
||||||
|
assertEquals(nextSequence + 1, thirdSequence);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testRegisterControlListenerAddsListener() {
|
||||||
|
IAgentControlListener listener = mock(IAgentControlListener.class);
|
||||||
|
agent.registerControlListener(listener);
|
||||||
|
assertTrue(agent.controlListeners.contains(listener));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testUnregisterControlListenerRemovesListener() {
|
||||||
|
IAgentControlListener listener = mock(IAgentControlListener.class);
|
||||||
|
agent.registerControlListener(listener);
|
||||||
|
assertTrue(agent.controlListeners.contains(listener));
|
||||||
|
agent.unregisterControlListener(listener);
|
||||||
|
assertFalse(agent.controlListeners.contains(listener));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCloseAndTerminateLinkLinkIsNullDoesNothing() {
|
||||||
|
agent.closeAndTerminateLink(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testCloseAndTerminateLinkValidLinkCallsCloseAndTerminate() {
|
||||||
|
Link mockLink = mock(Link.class);
|
||||||
|
agent.closeAndTerminateLink(mockLink);
|
||||||
|
verify(mockLink).close();
|
||||||
|
verify(mockLink).terminated();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testStopAndCleanupConnectionConnectionIsNullDoesNothing() {
|
||||||
|
agent.connection = null;
|
||||||
|
agent.stopAndCleanupConnection(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testStopAndCleanupConnectionValidConnectionNoWaitStopsAndCleansUp() throws IOException {
|
||||||
|
NioConnection mockConnection = mock(NioConnection.class);
|
||||||
|
agent.connection = mockConnection;
|
||||||
|
agent.stopAndCleanupConnection(false);
|
||||||
|
verify(mockConnection).stop();
|
||||||
|
verify(mockConnection).cleanUp();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testStopAndCleanupConnectionCleanupThrowsIOExceptionLogsWarning() throws IOException {
|
||||||
|
NioConnection mockConnection = mock(NioConnection.class);
|
||||||
|
agent.connection = mockConnection;
|
||||||
|
doThrow(new IOException("Cleanup failed")).when(mockConnection).cleanUp();
|
||||||
|
agent.stopAndCleanupConnection(false);
|
||||||
|
verify(mockConnection).stop();
|
||||||
|
verify(logger).warn(eq("Fail to clean up old connection. {}"), any(IOException.class));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testStopAndCleanupConnectionValidConnectionWaitForStopWaitsForStartupToStop() throws IOException {
|
||||||
|
NioConnection mockConnection = mock(NioConnection.class);
|
||||||
|
ConstantTimeBackoff mockBackoff = mock(ConstantTimeBackoff.class);
|
||||||
|
mockBackoff.setTimeToWait(0);
|
||||||
|
agent.connection = mockConnection;
|
||||||
|
when(shell.getBackoffAlgorithm()).thenReturn(mockBackoff);
|
||||||
|
when(mockConnection.isStartup()).thenReturn(true, true, false);
|
||||||
|
agent.stopAndCleanupConnection(true);
|
||||||
|
verify(mockConnection).stop();
|
||||||
|
verify(mockConnection).cleanUp();
|
||||||
|
verify(mockBackoff, times(3)).waitBeforeRetry();
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1 +0,0 @@
|
|||||||
mock-maker-inline
|
|
||||||
@ -24,7 +24,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>org.apache.cloudstack</groupId>
|
<groupId>org.apache.cloudstack</groupId>
|
||||||
<artifactId>cloudstack</artifactId>
|
<artifactId>cloudstack</artifactId>
|
||||||
<version>4.19.4.0-SNAPSHOT</version>
|
<version>4.20.3.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@ -20,6 +20,8 @@ import java.util.HashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.cloud.agent.api.LogLevel.Log4jLevel;
|
import com.cloud.agent.api.LogLevel.Log4jLevel;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* implemented by classes that extends the Command class. Command specifies
|
* implemented by classes that extends the Command class. Command specifies
|
||||||
@ -27,6 +29,8 @@ import com.cloud.agent.api.LogLevel.Log4jLevel;
|
|||||||
*/
|
*/
|
||||||
public abstract class Command {
|
public abstract class Command {
|
||||||
|
|
||||||
|
protected transient Logger logger = LogManager.getLogger(getClass());
|
||||||
|
|
||||||
public static enum OnError {
|
public static enum OnError {
|
||||||
Continue, Stop
|
Continue, Stop
|
||||||
}
|
}
|
||||||
|
|||||||
@ -23,8 +23,8 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
|
|||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
import java.lang.annotation.Target;
|
import java.lang.annotation.Target;
|
||||||
|
|
||||||
import org.apache.log4j.Level;
|
import org.apache.logging.log4j.Level;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*/
|
*/
|
||||||
@ -41,7 +41,7 @@ public @interface LogLevel {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public boolean enabled(Logger logger) {
|
public boolean enabled(Logger logger) {
|
||||||
return _level != Level.OFF && logger.isEnabledFor(_level);
|
return _level != Level.OFF && logger.isEnabled(_level);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,8 @@ import org.apache.cloudstack.utils.security.ParserUtils;
|
|||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.commons.lang.math.NumberUtils;
|
import org.apache.commons.lang.math.NumberUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
@ -63,7 +64,7 @@ import com.cloud.utils.compression.CompressionUtil;
|
|||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
public class OVFHelper {
|
public class OVFHelper {
|
||||||
private static final Logger s_logger = Logger.getLogger(OVFHelper.class);
|
protected Logger logger = LogManager.getLogger(getClass());
|
||||||
|
|
||||||
private final OVFParser ovfParser;
|
private final OVFParser ovfParser;
|
||||||
|
|
||||||
@ -118,7 +119,7 @@ public class OVFHelper {
|
|||||||
boolean password = StringUtils.isNotBlank(passStr) && passStr.equalsIgnoreCase("true");
|
boolean password = StringUtils.isNotBlank(passStr) && passStr.equalsIgnoreCase("true");
|
||||||
String label = ovfParser.getChildNodeValue(node, "Label");
|
String label = ovfParser.getChildNodeValue(node, "Label");
|
||||||
String description = ovfParser.getChildNodeValue(node, "Description");
|
String description = ovfParser.getChildNodeValue(node, "Description");
|
||||||
s_logger.debug("Creating OVF property index " + index + (category == null ? "" : " for category " + category)
|
logger.debug("Creating OVF property index " + index + (category == null ? "" : " for category " + category)
|
||||||
+ " with key = " + key);
|
+ " with key = " + key);
|
||||||
return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable,
|
return new OVFPropertyTO(key, type, value, qualifiers, userConfigurable,
|
||||||
label, description, password, index, category);
|
label, description, password, index, category);
|
||||||
@ -151,7 +152,7 @@ public class OVFHelper {
|
|||||||
if (child.getNodeName().equalsIgnoreCase("Category") ||
|
if (child.getNodeName().equalsIgnoreCase("Category") ||
|
||||||
child.getNodeName().endsWith(":Category")) {
|
child.getNodeName().endsWith(":Category")) {
|
||||||
lastCategoryFound = child.getTextContent();
|
lastCategoryFound = child.getTextContent();
|
||||||
s_logger.info("Category found " + lastCategoryFound);
|
logger.info("Category found " + lastCategoryFound);
|
||||||
} else if (child.getNodeName().equalsIgnoreCase("Property") ||
|
} else if (child.getNodeName().equalsIgnoreCase("Property") ||
|
||||||
child.getNodeName().endsWith(":Property")) {
|
child.getNodeName().endsWith(":Property")) {
|
||||||
OVFPropertyTO prop = createOVFPropertyFromNode(child, propertyIndex, lastCategoryFound);
|
OVFPropertyTO prop = createOVFPropertyFromNode(child, propertyIndex, lastCategoryFound);
|
||||||
@ -249,13 +250,13 @@ public class OVFHelper {
|
|||||||
int diskNumber = 0;
|
int diskNumber = 0;
|
||||||
for (OVFVirtualHardwareItemTO diskItem : diskHardwareItems) {
|
for (OVFVirtualHardwareItemTO diskItem : diskHardwareItems) {
|
||||||
if (StringUtils.isBlank(diskItem.getHostResource())) {
|
if (StringUtils.isBlank(diskItem.getHostResource())) {
|
||||||
s_logger.error("Missing disk information for hardware item " + diskItem.getElementName() + " " + diskItem.getInstanceId());
|
logger.error("Missing disk information for hardware item " + diskItem.getElementName() + " " + diskItem.getInstanceId());
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
String diskId = extractDiskIdFromDiskHostResource(diskItem.getHostResource());
|
String diskId = extractDiskIdFromDiskHostResource(diskItem.getHostResource());
|
||||||
OVFDisk diskDefinition = getDiskDefinitionFromDiskId(diskId, disks);
|
OVFDisk diskDefinition = getDiskDefinitionFromDiskId(diskId, disks);
|
||||||
if (diskDefinition == null) {
|
if (diskDefinition == null) {
|
||||||
s_logger.error("Missing disk definition for disk ID " + diskId);
|
logger.error("Missing disk definition for disk ID " + diskId);
|
||||||
}
|
}
|
||||||
OVFFile fileDefinition = getFileDefinitionFromDiskDefinition(diskDefinition._fileRef, files);
|
OVFFile fileDefinition = getFileDefinitionFromDiskDefinition(diskDefinition._fileRef, files);
|
||||||
DatadiskTO datadiskTO = generateDiskTO(fileDefinition, diskDefinition, ovfParentPath, diskNumber, diskItem);
|
DatadiskTO datadiskTO = generateDiskTO(fileDefinition, diskDefinition, ovfParentPath, diskNumber, diskItem);
|
||||||
@ -277,7 +278,7 @@ public class OVFHelper {
|
|||||||
if (StringUtils.isNotBlank(path)) {
|
if (StringUtils.isNotBlank(path)) {
|
||||||
File f = new File(path);
|
File f = new File(path);
|
||||||
if (!f.exists() || f.isDirectory()) {
|
if (!f.exists() || f.isDirectory()) {
|
||||||
s_logger.error("One of the attached disk or iso does not exists " + path);
|
logger.error("One of the attached disk or iso does not exists " + path);
|
||||||
throw new InternalErrorException("One of the attached disk or iso as stated on OVF does not exists " + path);
|
throw new InternalErrorException("One of the attached disk or iso as stated on OVF does not exists " + path);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -333,8 +334,8 @@ public class OVFHelper {
|
|||||||
od._controller = getControllerType(items, od._diskId);
|
od._controller = getControllerType(items, od._diskId);
|
||||||
vd.add(od);
|
vd.add(od);
|
||||||
}
|
}
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("found %d disk definitions",vd.size()));
|
logger.trace(String.format("found %d disk definitions",vd.size()));
|
||||||
}
|
}
|
||||||
return vd;
|
return vd;
|
||||||
}
|
}
|
||||||
@ -365,8 +366,8 @@ public class OVFHelper {
|
|||||||
vf.add(of);
|
vf.add(of);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("found %d file definitions in %s",vf.size(), ovfFile.getPath()));
|
logger.trace(String.format("found %d file definitions in %s",vf.size(), ovfFile.getPath()));
|
||||||
}
|
}
|
||||||
return vf;
|
return vf;
|
||||||
}
|
}
|
||||||
@ -461,7 +462,7 @@ public class OVFHelper {
|
|||||||
Element disk = (Element)disks.item(i);
|
Element disk = (Element)disks.item(i);
|
||||||
String fileRef = ovfParser.getNodeAttribute(disk, "fileRef");
|
String fileRef = ovfParser.getNodeAttribute(disk, "fileRef");
|
||||||
if (keepfile == null) {
|
if (keepfile == null) {
|
||||||
s_logger.info("FATAL: OVA format error");
|
logger.info("FATAL: OVA format error");
|
||||||
} else if (keepfile.equals(fileRef)) {
|
} else if (keepfile.equals(fileRef)) {
|
||||||
keepdisk = ovfParser.getNodeAttribute(disk, "diskId");
|
keepdisk = ovfParser.getNodeAttribute(disk, "diskId");
|
||||||
} else {
|
} else {
|
||||||
@ -505,7 +506,7 @@ public class OVFHelper {
|
|||||||
outfile.write(writer.toString());
|
outfile.write(writer.toString());
|
||||||
outfile.close();
|
outfile.close();
|
||||||
} catch (IOException | TransformerException e) {
|
} catch (IOException | TransformerException e) {
|
||||||
s_logger.info("Unexpected exception caught while rewriting OVF:" + e.getMessage(), e);
|
logger.info("Unexpected exception caught while rewriting OVF:" + e.getMessage(), e);
|
||||||
throw new CloudRuntimeException(e);
|
throw new CloudRuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -521,8 +522,8 @@ public class OVFHelper {
|
|||||||
|
|
||||||
public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {
|
public List<OVFNetworkTO> getNetPrerequisitesFromDocument(Document doc) throws InternalErrorException {
|
||||||
if (doc == null) {
|
if (doc == null) {
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace("no document to parse; returning no prerequisite networks");
|
logger.trace("no document to parse; returning no prerequisite networks");
|
||||||
}
|
}
|
||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
@ -539,8 +540,8 @@ public class OVFHelper {
|
|||||||
private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement) {
|
private void matchNicsToNets(Map<String, OVFNetworkTO> nets, Node systemElement) {
|
||||||
final DocumentTraversal traversal = (DocumentTraversal) systemElement;
|
final DocumentTraversal traversal = (DocumentTraversal) systemElement;
|
||||||
final NodeIterator iterator = traversal.createNodeIterator(systemElement, NodeFilter.SHOW_ELEMENT, null, true);
|
final NodeIterator iterator = traversal.createNodeIterator(systemElement, NodeFilter.SHOW_ELEMENT, null, true);
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("starting out with %d network-prerequisites, parsing hardware",nets.size()));
|
logger.trace(String.format("starting out with %d network-prerequisites, parsing hardware",nets.size()));
|
||||||
}
|
}
|
||||||
int nicCount = 0;
|
int nicCount = 0;
|
||||||
for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) {
|
for (Node n = iterator.nextNode(); n != null; n = iterator.nextNode()) {
|
||||||
@ -549,8 +550,8 @@ public class OVFHelper {
|
|||||||
nicCount++;
|
nicCount++;
|
||||||
String name = e.getTextContent(); // should be in our nets
|
String name = e.getTextContent(); // should be in our nets
|
||||||
if(nets.get(name) == null) {
|
if(nets.get(name) == null) {
|
||||||
if(s_logger.isInfoEnabled()) {
|
if(logger.isInfoEnabled()) {
|
||||||
s_logger.info(String.format("found a nic definition without a network definition byname %s, adding it to the list.", name));
|
logger.info(String.format("found a nic definition without a network definition byname %s, adding it to the list.", name));
|
||||||
}
|
}
|
||||||
nets.put(name, new OVFNetworkTO());
|
nets.put(name, new OVFNetworkTO());
|
||||||
}
|
}
|
||||||
@ -560,8 +561,8 @@ public class OVFHelper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("ending up with %d network-prerequisites, parsed %d nics", nets.size(), nicCount));
|
logger.trace(String.format("ending up with %d network-prerequisites, parsed %d nics", nets.size(), nicCount));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -584,7 +585,7 @@ public class OVFHelper {
|
|||||||
int addressOnParent = Integer.parseInt(addressOnParentStr);
|
int addressOnParent = Integer.parseInt(addressOnParentStr);
|
||||||
nic.setAddressOnParent(addressOnParent);
|
nic.setAddressOnParent(addressOnParent);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
s_logger.warn("Encountered element of type \"AddressOnParent\", that could not be parse to an integer number: " + addressOnParentStr);
|
logger.warn("Encountered element of type \"AddressOnParent\", that could not be parse to an integer number: " + addressOnParentStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean automaticAllocation = StringUtils.isNotBlank(automaticAllocationStr) && Boolean.parseBoolean(automaticAllocationStr);
|
boolean automaticAllocation = StringUtils.isNotBlank(automaticAllocationStr) && Boolean.parseBoolean(automaticAllocationStr);
|
||||||
@ -596,7 +597,7 @@ public class OVFHelper {
|
|||||||
int instanceId = Integer.parseInt(instanceIdStr);
|
int instanceId = Integer.parseInt(instanceIdStr);
|
||||||
nic.setInstanceID(instanceId);
|
nic.setInstanceID(instanceId);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
s_logger.warn("Encountered element of type \"InstanceID\", that could not be parse to an integer number: " + instanceIdStr);
|
logger.warn("Encountered element of type \"InstanceID\", that could not be parse to an integer number: " + instanceIdStr);
|
||||||
}
|
}
|
||||||
|
|
||||||
nic.setResourceSubType(resourceSubType);
|
nic.setResourceSubType(resourceSubType);
|
||||||
@ -608,7 +609,7 @@ public class OVFHelper {
|
|||||||
NodeList systemElements = ovfParser.getElementsFromOVFDocument(doc, "VirtualSystem");
|
NodeList systemElements = ovfParser.getElementsFromOVFDocument(doc, "VirtualSystem");
|
||||||
if (systemElements.getLength() != 1) {
|
if (systemElements.getLength() != 1) {
|
||||||
String msg = "found " + systemElements.getLength() + " system definitions in OVA, can only handle exactly one.";
|
String msg = "found " + systemElements.getLength() + " system definitions in OVA, can only handle exactly one.";
|
||||||
s_logger.warn(msg);
|
logger.warn(msg);
|
||||||
throw new InternalErrorException(msg);
|
throw new InternalErrorException(msg);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -629,8 +630,8 @@ public class OVFHelper {
|
|||||||
|
|
||||||
nets.put(networkName,network);
|
nets.put(networkName,network);
|
||||||
}
|
}
|
||||||
if (s_logger.isTraceEnabled()) {
|
if (logger.isTraceEnabled()) {
|
||||||
s_logger.trace(String.format("found %d networks in template", nets.size()));
|
logger.trace(String.format("found %d networks in template", nets.size()));
|
||||||
}
|
}
|
||||||
return nets;
|
return nets;
|
||||||
}
|
}
|
||||||
@ -770,7 +771,7 @@ public class OVFHelper {
|
|||||||
try {
|
try {
|
||||||
return Long.parseLong(value);
|
return Long.parseLong(value);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
s_logger.debug("Could not parse the value: " + value + ", ignoring it");
|
logger.debug("Could not parse the value: " + value + ", ignoring it");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@ -781,7 +782,7 @@ public class OVFHelper {
|
|||||||
try {
|
try {
|
||||||
return Integer.parseInt(value);
|
return Integer.parseInt(value);
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
s_logger.debug("Could not parse the value: " + value + ", ignoring it");
|
logger.debug("Could not parse the value: " + value + ", ignoring it");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
@ -819,7 +820,7 @@ public class OVFHelper {
|
|||||||
try {
|
try {
|
||||||
compressedLicense = compressOVFEula(eulaLicense);
|
compressedLicense = compressOVFEula(eulaLicense);
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
s_logger.error("Could not compress the license for info " + eulaInfo);
|
logger.error("Could not compress the license for info " + eulaInfo);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
OVFEulaSectionTO eula = new OVFEulaSectionTO(eulaInfo, compressedLicense, eulaIndex);
|
OVFEulaSectionTO eula = new OVFEulaSectionTO(eulaInfo, compressedLicense, eulaIndex);
|
||||||
|
|||||||
@ -27,7 +27,8 @@ import javax.xml.parsers.ParserConfigurationException;
|
|||||||
|
|
||||||
import org.apache.cloudstack.utils.security.ParserUtils;
|
import org.apache.cloudstack.utils.security.ParserUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.w3c.dom.Document;
|
import org.w3c.dom.Document;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
import org.w3c.dom.Node;
|
import org.w3c.dom.Node;
|
||||||
@ -36,7 +37,7 @@ import org.xml.sax.InputSource;
|
|||||||
import org.xml.sax.SAXException;
|
import org.xml.sax.SAXException;
|
||||||
|
|
||||||
public class OVFParser {
|
public class OVFParser {
|
||||||
private static final Logger s_logger = Logger.getLogger(OVFParser.class);
|
protected Logger logger = LogManager.getLogger(getClass());
|
||||||
|
|
||||||
private static final String DEFAULT_OVF_SCHEMA = "http://schemas.dmtf.org/ovf/envelope/1";
|
private static final String DEFAULT_OVF_SCHEMA = "http://schemas.dmtf.org/ovf/envelope/1";
|
||||||
private static final String VMW_SCHEMA = "http://www.vmware.com/schema/ovf";
|
private static final String VMW_SCHEMA = "http://www.vmware.com/schema/ovf";
|
||||||
@ -53,7 +54,7 @@ public class OVFParser {
|
|||||||
documentBuilderFactory.setNamespaceAware(true);
|
documentBuilderFactory.setNamespaceAware(true);
|
||||||
documentBuilder = documentBuilderFactory.newDocumentBuilder();
|
documentBuilder = documentBuilderFactory.newDocumentBuilder();
|
||||||
} catch (ParserConfigurationException e) {
|
} catch (ParserConfigurationException e) {
|
||||||
s_logger.error("Cannot start the OVF parser: " + e.getMessage(), e);
|
logger.error("Cannot start the OVF parser: " + e.getMessage(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -69,7 +70,7 @@ public class OVFParser {
|
|||||||
try {
|
try {
|
||||||
return documentBuilder.parse(new File(ovfFilePath));
|
return documentBuilder.parse(new File(ovfFilePath));
|
||||||
} catch (SAXException | IOException e) {
|
} catch (SAXException | IOException e) {
|
||||||
s_logger.error("Error parsing " + ovfFilePath + " " + e.getMessage(), e);
|
logger.error("Error parsing " + ovfFilePath + " " + e.getMessage(), e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
50
api/src/main/java/com/cloud/agent/api/to/BucketTO.java
Normal file
50
api/src/main/java/com/cloud/agent/api/to/BucketTO.java
Normal file
@ -0,0 +1,50 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.agent.api.to;
|
||||||
|
|
||||||
|
import org.apache.cloudstack.storage.object.Bucket;
|
||||||
|
|
||||||
|
public final class BucketTO {
|
||||||
|
|
||||||
|
private String name;
|
||||||
|
|
||||||
|
private String accessKey;
|
||||||
|
|
||||||
|
private String secretKey;
|
||||||
|
|
||||||
|
public BucketTO(Bucket bucket) {
|
||||||
|
this.name = bucket.getName();
|
||||||
|
this.accessKey = bucket.getAccessKey();
|
||||||
|
this.secretKey = bucket.getSecretKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
public BucketTO(String name) {
|
||||||
|
this.name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getName() {
|
||||||
|
return this.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAccessKey() {
|
||||||
|
return this.accessKey;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getSecretKey() {
|
||||||
|
return this.secretKey;
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -155,9 +155,7 @@ public class FirewallRuleTO implements InternalIdentity {
|
|||||||
rule.getIcmpType(),
|
rule.getIcmpType(),
|
||||||
rule.getIcmpCode());
|
rule.getIcmpCode());
|
||||||
this.trafficType = trafficType;
|
this.trafficType = trafficType;
|
||||||
if (FirewallRule.Purpose.Ipv6Firewall.equals(purpose)) {
|
this.destCidrList = rule.getDestinationCidrList();
|
||||||
this.destCidrList = rule.getDestinationCidrList();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType,
|
public FirewallRuleTO(FirewallRule rule, String srcVlanTag, String srcIp, FirewallRule.Purpose purpose, FirewallRule.TrafficType trafficType,
|
||||||
|
|||||||
@ -374,13 +374,15 @@ public class LoadBalancerTO {
|
|||||||
public static class CounterTO implements Serializable {
|
public static class CounterTO implements Serializable {
|
||||||
private static final long serialVersionUID = 2L;
|
private static final long serialVersionUID = 2L;
|
||||||
private final Long id;
|
private final Long id;
|
||||||
|
private final String uuid;
|
||||||
private final String name;
|
private final String name;
|
||||||
private final Counter.Source source;
|
private final Counter.Source source;
|
||||||
private final String value;
|
private final String value;
|
||||||
private final String provider;
|
private final String provider;
|
||||||
|
|
||||||
public CounterTO(Long id, String name, Counter.Source source, String value, String provider) {
|
public CounterTO(Long id, String uuid, String name, Counter.Source source, String value, String provider) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
this.uuid = uuid;
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.source = source;
|
this.source = source;
|
||||||
this.value = value;
|
this.value = value;
|
||||||
@ -391,6 +393,10 @@ public class LoadBalancerTO {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUuid() {
|
||||||
|
return uuid;
|
||||||
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
@ -411,12 +417,14 @@ public class LoadBalancerTO {
|
|||||||
public static class ConditionTO implements Serializable {
|
public static class ConditionTO implements Serializable {
|
||||||
private static final long serialVersionUID = 2L;
|
private static final long serialVersionUID = 2L;
|
||||||
private final Long id;
|
private final Long id;
|
||||||
|
private final String uuid;
|
||||||
private final long threshold;
|
private final long threshold;
|
||||||
private final Condition.Operator relationalOperator;
|
private final Condition.Operator relationalOperator;
|
||||||
private final CounterTO counter;
|
private final CounterTO counter;
|
||||||
|
|
||||||
public ConditionTO(Long id, long threshold, Condition.Operator relationalOperator, CounterTO counter) {
|
public ConditionTO(Long id, String uuid, long threshold, Condition.Operator relationalOperator, CounterTO counter) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
this.uuid = uuid;
|
||||||
this.threshold = threshold;
|
this.threshold = threshold;
|
||||||
this.relationalOperator = relationalOperator;
|
this.relationalOperator = relationalOperator;
|
||||||
this.counter = counter;
|
this.counter = counter;
|
||||||
@ -426,6 +434,10 @@ public class LoadBalancerTO {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUuid() {
|
||||||
|
return uuid;
|
||||||
|
}
|
||||||
|
|
||||||
public long getThreshold() {
|
public long getThreshold() {
|
||||||
return threshold;
|
return threshold;
|
||||||
}
|
}
|
||||||
@ -442,6 +454,7 @@ public class LoadBalancerTO {
|
|||||||
public static class AutoScalePolicyTO implements Serializable {
|
public static class AutoScalePolicyTO implements Serializable {
|
||||||
private static final long serialVersionUID = 2L;
|
private static final long serialVersionUID = 2L;
|
||||||
private final long id;
|
private final long id;
|
||||||
|
private final String uuid;
|
||||||
private final int duration;
|
private final int duration;
|
||||||
private final int quietTime;
|
private final int quietTime;
|
||||||
private final Date lastQuietTime;
|
private final Date lastQuietTime;
|
||||||
@ -449,8 +462,9 @@ public class LoadBalancerTO {
|
|||||||
boolean revoked;
|
boolean revoked;
|
||||||
private final List<ConditionTO> conditions;
|
private final List<ConditionTO> conditions;
|
||||||
|
|
||||||
public AutoScalePolicyTO(long id, int duration, int quietTime, Date lastQuietTime, AutoScalePolicy.Action action, List<ConditionTO> conditions, boolean revoked) {
|
public AutoScalePolicyTO(long id, String uuid, int duration, int quietTime, Date lastQuietTime, AutoScalePolicy.Action action, List<ConditionTO> conditions, boolean revoked) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
|
this.uuid = uuid;
|
||||||
this.duration = duration;
|
this.duration = duration;
|
||||||
this.quietTime = quietTime;
|
this.quietTime = quietTime;
|
||||||
this.lastQuietTime = lastQuietTime;
|
this.lastQuietTime = lastQuietTime;
|
||||||
@ -463,6 +477,10 @@ public class LoadBalancerTO {
|
|||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getUuid() {
|
||||||
|
return uuid;
|
||||||
|
}
|
||||||
|
|
||||||
public int getDuration() {
|
public int getDuration() {
|
||||||
return duration;
|
return duration;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
package com.cloud.agent.api.to;
|
package com.cloud.agent.api.to;
|
||||||
|
|
||||||
import com.cloud.storage.DataStoreRole;
|
import com.cloud.storage.DataStoreRole;
|
||||||
|
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||||
|
|
||||||
public class NfsTO implements DataStoreTO {
|
public class NfsTO implements DataStoreTO {
|
||||||
|
|
||||||
@ -41,6 +42,13 @@ public class NfsTO implements DataStoreTO {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("NfsTO %s",
|
||||||
|
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
|
||||||
|
this, "uuid", "_url", "_role", "nfsVersion"));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getUrl() {
|
public String getUrl() {
|
||||||
return _url;
|
return _url;
|
||||||
|
|||||||
@ -32,6 +32,9 @@ public class NicTO extends NetworkTO {
|
|||||||
Map<NetworkOffering.Detail, String> details;
|
Map<NetworkOffering.Detail, String> details;
|
||||||
boolean dpdkEnabled;
|
boolean dpdkEnabled;
|
||||||
Integer mtu;
|
Integer mtu;
|
||||||
|
Long networkId;
|
||||||
|
|
||||||
|
String networkSegmentName;
|
||||||
|
|
||||||
public NicTO() {
|
public NicTO() {
|
||||||
super();
|
super();
|
||||||
@ -127,4 +130,20 @@ public class NicTO extends NetworkTO {
|
|||||||
public void setMtu(Integer mtu) {
|
public void setMtu(Integer mtu) {
|
||||||
this.mtu = mtu;
|
this.mtu = mtu;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Long getNetworkId() {
|
||||||
|
return networkId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNetworkId(Long networkId) {
|
||||||
|
this.networkId = networkId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getNetworkSegmentName() {
|
||||||
|
return networkSegmentName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNetworkSegmentName(String networkSegmentName) {
|
||||||
|
this.networkSegmentName = networkSegmentName;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import com.cloud.agent.api.LogLevel;
|
|||||||
import com.cloud.agent.api.LogLevel.Log4jLevel;
|
import com.cloud.agent.api.LogLevel.Log4jLevel;
|
||||||
import com.cloud.storage.DataStoreRole;
|
import com.cloud.storage.DataStoreRole;
|
||||||
import com.cloud.utils.storage.S3.ClientOptions;
|
import com.cloud.utils.storage.S3.ClientOptions;
|
||||||
|
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||||
|
|
||||||
public final class S3TO implements ClientOptions, DataStoreTO {
|
public final class S3TO implements ClientOptions, DataStoreTO {
|
||||||
|
|
||||||
@ -68,6 +69,13 @@ public final class S3TO implements ClientOptions, DataStoreTO {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("S3TO %s",
|
||||||
|
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
|
||||||
|
this, "id", "uuid", "bucketName"));
|
||||||
|
}
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return this.id;
|
return this.id;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package com.cloud.agent.api.to;
|
|||||||
import com.cloud.agent.api.LogLevel;
|
import com.cloud.agent.api.LogLevel;
|
||||||
import com.cloud.storage.Storage.StoragePoolType;
|
import com.cloud.storage.Storage.StoragePoolType;
|
||||||
import com.cloud.storage.StoragePool;
|
import com.cloud.storage.StoragePool;
|
||||||
|
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||||
|
|
||||||
public class StorageFilerTO {
|
public class StorageFilerTO {
|
||||||
long id;
|
long id;
|
||||||
@ -73,6 +74,6 @@ public class StorageFilerTO {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return new StringBuilder("Pool[").append(id).append("|").append(host).append(":").append(port).append("|").append(path).append("]").toString();
|
return String.format("Pool %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "uuid", "host", "port", "path"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,7 @@ package com.cloud.agent.api.to;
|
|||||||
|
|
||||||
import com.cloud.storage.DataStoreRole;
|
import com.cloud.storage.DataStoreRole;
|
||||||
import com.cloud.utils.SwiftUtil;
|
import com.cloud.utils.SwiftUtil;
|
||||||
|
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||||
|
|
||||||
public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
|
public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
|
||||||
Long id;
|
Long id;
|
||||||
@ -41,6 +42,13 @@ public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
|
|||||||
this.storagePolicy = storagePolicy;
|
this.storagePolicy = storagePolicy;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("SwiftTO %s",
|
||||||
|
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
|
||||||
|
this, "id", "account", "userName"));
|
||||||
|
}
|
||||||
|
|
||||||
public Long getId() {
|
public Long getId() {
|
||||||
return id;
|
return id;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -82,7 +82,10 @@ public class VirtualMachineTO {
|
|||||||
|
|
||||||
Map<String, String> guestOsDetails = new HashMap<String, String>();
|
Map<String, String> guestOsDetails = new HashMap<String, String>();
|
||||||
Map<String, String> extraConfig = new HashMap<>();
|
Map<String, String> extraConfig = new HashMap<>();
|
||||||
|
Map<Long, String> networkIdToNetworkNameMap = new HashMap<>();
|
||||||
DeployAsIsInfoTO deployAsIsInfo;
|
DeployAsIsInfoTO deployAsIsInfo;
|
||||||
|
String metadataManufacturer;
|
||||||
|
String metadataProductName;
|
||||||
|
|
||||||
public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
|
public VirtualMachineTO(long id, String instanceName, VirtualMachine.Type type, int cpus, Integer speed, long minRam, long maxRam, BootloaderType bootloader,
|
||||||
String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
|
String os, boolean enableHA, boolean limitCpuUse, String vncPassword) {
|
||||||
@ -392,6 +395,14 @@ public class VirtualMachineTO {
|
|||||||
return extraConfig;
|
return extraConfig;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Map<Long, String> getNetworkIdToNetworkNameMap() {
|
||||||
|
return networkIdToNetworkNameMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setNetworkIdToNetworkNameMap(Map<Long, String> networkIdToNetworkNameMap) {
|
||||||
|
this.networkIdToNetworkNameMap = networkIdToNetworkNameMap;
|
||||||
|
}
|
||||||
|
|
||||||
public String getBootType() {
|
public String getBootType() {
|
||||||
return bootType;
|
return bootType;
|
||||||
}
|
}
|
||||||
@ -420,6 +431,22 @@ public class VirtualMachineTO {
|
|||||||
this.deployAsIsInfo = deployAsIsInfo;
|
this.deployAsIsInfo = deployAsIsInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getMetadataManufacturer() {
|
||||||
|
return metadataManufacturer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMetadataManufacturer(String metadataManufacturer) {
|
||||||
|
this.metadataManufacturer = metadataManufacturer;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getMetadataProductName() {
|
||||||
|
return metadataProductName;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setMetadataProductName(String metadataProductName) {
|
||||||
|
this.metadataProductName = metadataProductName;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return String.format("VM {id: \"%s\", name: \"%s\", uuid: \"%s\", type: \"%s\"}", id, name, uuid, type);
|
return String.format("VM {id: \"%s\", name: \"%s\", uuid: \"%s\", type: \"%s\"}", id, name, uuid, type);
|
||||||
|
|||||||
38
api/src/main/java/com/cloud/bgp/ASNumber.java
Normal file
38
api/src/main/java/com/cloud/bgp/ASNumber.java
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.bgp;
|
||||||
|
|
||||||
|
import org.apache.cloudstack.acl.InfrastructureEntity;
|
||||||
|
import org.apache.cloudstack.api.Identity;
|
||||||
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
public interface ASNumber extends InfrastructureEntity, InternalIdentity, Identity {
|
||||||
|
|
||||||
|
Long getAccountId();
|
||||||
|
Long getDomainId();
|
||||||
|
long getAsNumber();
|
||||||
|
long getAsNumberRangeId();
|
||||||
|
long getDataCenterId();
|
||||||
|
Date getAllocatedTime();
|
||||||
|
boolean isAllocated();
|
||||||
|
Long getNetworkId();
|
||||||
|
Long getVpcId();
|
||||||
|
Date getCreated();
|
||||||
|
Date getRemoved();
|
||||||
|
}
|
||||||
31
api/src/main/java/com/cloud/bgp/ASNumberRange.java
Normal file
31
api/src/main/java/com/cloud/bgp/ASNumberRange.java
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.bgp;
|
||||||
|
|
||||||
|
import org.apache.cloudstack.acl.InfrastructureEntity;
|
||||||
|
import org.apache.cloudstack.api.Identity;
|
||||||
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
public interface ASNumberRange extends InfrastructureEntity, InternalIdentity, Identity {
|
||||||
|
|
||||||
|
long getStartASNumber();
|
||||||
|
long getEndASNumber();
|
||||||
|
long getDataCenterId();
|
||||||
|
Date getCreated();
|
||||||
|
}
|
||||||
44
api/src/main/java/com/cloud/bgp/BGPService.java
Normal file
44
api/src/main/java/com/cloud/bgp/BGPService.java
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.bgp;
|
||||||
|
|
||||||
|
import com.cloud.exception.ResourceUnavailableException;
|
||||||
|
import com.cloud.network.Network;
|
||||||
|
import com.cloud.network.vpc.Vpc;
|
||||||
|
import com.cloud.utils.Pair;
|
||||||
|
import org.apache.cloudstack.api.command.user.bgp.ListASNumbersCmd;
|
||||||
|
import org.apache.cloudstack.network.BgpPeer;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface BGPService {
|
||||||
|
|
||||||
|
ASNumberRange createASNumberRange(long zoneId, long startASNumber, long endASNumber);
|
||||||
|
List<ASNumberRange> listASNumberRanges(Long zoneId);
|
||||||
|
Pair<List<ASNumber>, Integer> listASNumbers(ListASNumbersCmd cmd);
|
||||||
|
boolean allocateASNumber(long zoneId, Long asNumber, Long networkId, Long vpcId);
|
||||||
|
Pair<Boolean, String> releaseASNumber(long zoneId, long asNumber, boolean isReleaseNetworkDestroy);
|
||||||
|
boolean deleteASRange(long id);
|
||||||
|
|
||||||
|
boolean applyBgpPeers(Network network, boolean continueOnError) throws ResourceUnavailableException;
|
||||||
|
|
||||||
|
boolean applyBgpPeers(Vpc vpc, boolean continueOnError) throws ResourceUnavailableException;
|
||||||
|
|
||||||
|
List<? extends BgpPeer> getBgpPeersForNetwork(Network network);
|
||||||
|
|
||||||
|
List<? extends BgpPeer> getBgpPeersForVpc(Vpc vpc);
|
||||||
|
}
|
||||||
@ -16,6 +16,8 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.capacity;
|
package com.cloud.capacity;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.Identity;
|
import org.apache.cloudstack.api.Identity;
|
||||||
import org.apache.cloudstack.api.InternalIdentity;
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
@ -35,6 +37,11 @@ public interface Capacity extends InternalIdentity, Identity {
|
|||||||
|
|
||||||
public static final short CAPACITY_TYPE_CPU_CORE = 90;
|
public static final short CAPACITY_TYPE_CPU_CORE = 90;
|
||||||
|
|
||||||
|
public static final List<Short> STORAGE_CAPACITY_TYPES = List.of(CAPACITY_TYPE_STORAGE,
|
||||||
|
CAPACITY_TYPE_STORAGE_ALLOCATED,
|
||||||
|
CAPACITY_TYPE_SECONDARY_STORAGE,
|
||||||
|
CAPACITY_TYPE_LOCAL_STORAGE);
|
||||||
|
|
||||||
public Long getHostOrPoolId();
|
public Long getHostOrPoolId();
|
||||||
|
|
||||||
public Long getDataCenterId();
|
public Long getDataCenterId();
|
||||||
@ -54,4 +61,6 @@ public interface Capacity extends InternalIdentity, Identity {
|
|||||||
public Float getUsedPercentage();
|
public Float getUsedPercentage();
|
||||||
|
|
||||||
public Long getAllocatedCapacity();
|
public Long getAllocatedCapacity();
|
||||||
|
|
||||||
|
public String getTag();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -85,5 +85,6 @@ public interface Resource {
|
|||||||
long getOwnerId();
|
long getOwnerId();
|
||||||
|
|
||||||
ResourceOwnerType getResourceOwnerType();
|
ResourceOwnerType getResourceOwnerType();
|
||||||
|
String getTag();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
70
api/src/main/java/com/cloud/cpu/CPU.java
Normal file
70
api/src/main/java/com/cloud/cpu/CPU.java
Normal file
@ -0,0 +1,70 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.cpu;
|
||||||
|
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
|
public class CPU {
|
||||||
|
public enum CPUArch {
|
||||||
|
x86("i686", 32),
|
||||||
|
amd64("x86_64", 64),
|
||||||
|
arm64("aarch64", 64);
|
||||||
|
|
||||||
|
private final String type;
|
||||||
|
private final int bits;
|
||||||
|
|
||||||
|
CPUArch(String type, int bits) {
|
||||||
|
this.type = type;
|
||||||
|
this.bits = bits;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CPUArch getDefault() {
|
||||||
|
return amd64;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getType() {
|
||||||
|
return type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getBits() {
|
||||||
|
return bits;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static CPUArch fromType(String type) {
|
||||||
|
if (StringUtils.isBlank(type)) {
|
||||||
|
return getDefault();
|
||||||
|
}
|
||||||
|
for (CPUArch arch : values()) {
|
||||||
|
if (arch.type.equals(type)) {
|
||||||
|
return arch;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new IllegalArgumentException("Unsupported arch type: " + type);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getTypesAsCSV() {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
for (CPUArch arch : values()) {
|
||||||
|
sb.append(arch.getType()).append(",");
|
||||||
|
}
|
||||||
|
if (sb.length() > 0) {
|
||||||
|
sb.setLength(sb.length() - 1);
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -21,6 +21,10 @@ import org.apache.cloudstack.api.Identity;
|
|||||||
import org.apache.cloudstack.api.InternalIdentity;
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
public interface DedicatedResources extends InfrastructureEntity, InternalIdentity, Identity {
|
public interface DedicatedResources extends InfrastructureEntity, InternalIdentity, Identity {
|
||||||
|
enum Type {
|
||||||
|
Zone, Pod, Cluster, Host
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
long getId();
|
long getId();
|
||||||
|
|
||||||
|
|||||||
@ -57,6 +57,17 @@ public interface DeploymentClusterPlanner extends DeploymentPlanner {
|
|||||||
false,
|
false,
|
||||||
ConfigKey.Scope.Global);
|
ConfigKey.Scope.Global);
|
||||||
|
|
||||||
|
static final ConfigKey<String> VmAllocationAlgorithm = new ConfigKey<>(
|
||||||
|
String.class,
|
||||||
|
"vm.allocation.algorithm",
|
||||||
|
"Advanced",
|
||||||
|
"random",
|
||||||
|
"Order in which hosts within a cluster will be considered for VM/volume allocation. The value can be 'random', 'firstfit', 'userdispersing', 'userconcentratedpod_random', 'userconcentratedpod_firstfit', or 'firstfitleastconsumed'.",
|
||||||
|
true,
|
||||||
|
ConfigKey.Scope.Global, null, null, null, null, null,
|
||||||
|
ConfigKey.Kind.Select,
|
||||||
|
"random,firstfit,userdispersing,userconcentratedpod_random,userconcentratedpod_firstfit,firstfitleastconsumed");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is called to determine list of possible clusters where a virtual
|
* This is called to determine list of possible clusters where a virtual
|
||||||
* machine can be deployed.
|
* machine can be deployed.
|
||||||
|
|||||||
@ -21,8 +21,12 @@ import java.util.Collection;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
|
||||||
import com.cloud.dc.DataCenter;
|
import com.cloud.dc.DataCenter;
|
||||||
import com.cloud.dc.Pod;
|
import com.cloud.dc.Pod;
|
||||||
|
import com.cloud.exception.CloudException;
|
||||||
import com.cloud.exception.InsufficientCapacityException;
|
import com.cloud.exception.InsufficientCapacityException;
|
||||||
import com.cloud.exception.InsufficientServerCapacityException;
|
import com.cloud.exception.InsufficientServerCapacityException;
|
||||||
import com.cloud.exception.ResourceUnavailableException;
|
import com.cloud.exception.ResourceUnavailableException;
|
||||||
@ -75,7 +79,7 @@ public interface DeploymentPlanner extends Adapter {
|
|||||||
|
|
||||||
public static class ExcludeList implements Serializable {
|
public static class ExcludeList implements Serializable {
|
||||||
private static final long serialVersionUID = -482175549460148301L;
|
private static final long serialVersionUID = -482175549460148301L;
|
||||||
|
protected static Logger LOGGER = LogManager.getLogger(ExcludeList.class);
|
||||||
private Set<Long> _dcIds;
|
private Set<Long> _dcIds;
|
||||||
private Set<Long> _podIds;
|
private Set<Long> _podIds;
|
||||||
private Set<Long> _clusterIds;
|
private Set<Long> _clusterIds;
|
||||||
@ -104,13 +108,26 @@ public interface DeploymentPlanner extends Adapter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void logAvoid(Class<?> scope, CloudException e) {
|
||||||
|
Long id = null;
|
||||||
|
if (e instanceof InsufficientCapacityException) {
|
||||||
|
id = ((InsufficientCapacityException) e).getId();
|
||||||
|
} else if (e instanceof ResourceUnavailableException) {
|
||||||
|
id = ((ResourceUnavailableException) e).getResourceId();
|
||||||
|
} else {
|
||||||
|
LOGGER.debug("Failed to log avoided component due to unexpected exception type [{}].", e.getMessage());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
LOGGER.debug("Adding {} [{}] to the avoid set due to [{}].", scope.getSimpleName(), id, e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
public boolean add(InsufficientCapacityException e) {
|
public boolean add(InsufficientCapacityException e) {
|
||||||
Class<?> scope = e.getScope();
|
Class<?> scope = e.getScope();
|
||||||
|
|
||||||
if (scope == null) {
|
if (scope == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
logAvoid(scope, e);
|
||||||
if (Host.class.isAssignableFrom(scope)) {
|
if (Host.class.isAssignableFrom(scope)) {
|
||||||
addHost(e.getId());
|
addHost(e.getId());
|
||||||
} else if (Pod.class.isAssignableFrom(scope)) {
|
} else if (Pod.class.isAssignableFrom(scope)) {
|
||||||
@ -128,13 +145,14 @@ public interface DeploymentPlanner extends Adapter {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public boolean add(ResourceUnavailableException e) {
|
public boolean add(ResourceUnavailableException e) {
|
||||||
Class<?> scope = e.getScope();
|
Class<?> scope = e.getScope();
|
||||||
|
|
||||||
if (scope == null) {
|
if (scope == null) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
logAvoid(scope, e);
|
||||||
if (Host.class.isAssignableFrom(scope)) {
|
if (Host.class.isAssignableFrom(scope)) {
|
||||||
addHost(e.getResourceId());
|
addHost(e.getResourceId());
|
||||||
} else if (Pod.class.isAssignableFrom(scope)) {
|
} else if (Pod.class.isAssignableFrom(scope)) {
|
||||||
|
|||||||
@ -28,8 +28,12 @@ import org.apache.cloudstack.api.response.HostResponse;
|
|||||||
import org.apache.cloudstack.api.response.PodResponse;
|
import org.apache.cloudstack.api.response.PodResponse;
|
||||||
import org.apache.cloudstack.api.response.ZoneResponse;
|
import org.apache.cloudstack.api.response.ZoneResponse;
|
||||||
import org.apache.cloudstack.config.Configuration;
|
import org.apache.cloudstack.config.Configuration;
|
||||||
|
import org.apache.cloudstack.datacenter.DataCenterIpv4GuestSubnet;
|
||||||
import org.apache.cloudstack.ha.HAConfig;
|
import org.apache.cloudstack.ha.HAConfig;
|
||||||
|
import org.apache.cloudstack.network.BgpPeer;
|
||||||
|
import org.apache.cloudstack.network.Ipv4GuestSubnetNetworkMap;
|
||||||
import org.apache.cloudstack.quota.QuotaTariff;
|
import org.apache.cloudstack.quota.QuotaTariff;
|
||||||
|
import org.apache.cloudstack.storage.sharedfs.SharedFS;
|
||||||
import org.apache.cloudstack.storage.object.Bucket;
|
import org.apache.cloudstack.storage.object.Bucket;
|
||||||
import org.apache.cloudstack.storage.object.ObjectStore;
|
import org.apache.cloudstack.storage.object.ObjectStore;
|
||||||
import org.apache.cloudstack.usage.Usage;
|
import org.apache.cloudstack.usage.Usage;
|
||||||
@ -242,6 +246,8 @@ public class EventTypes {
|
|||||||
public static final String EVENT_ROLE_UPDATE = "ROLE.UPDATE";
|
public static final String EVENT_ROLE_UPDATE = "ROLE.UPDATE";
|
||||||
public static final String EVENT_ROLE_DELETE = "ROLE.DELETE";
|
public static final String EVENT_ROLE_DELETE = "ROLE.DELETE";
|
||||||
public static final String EVENT_ROLE_IMPORT = "ROLE.IMPORT";
|
public static final String EVENT_ROLE_IMPORT = "ROLE.IMPORT";
|
||||||
|
public static final String EVENT_ROLE_ENABLE = "ROLE.ENABLE";
|
||||||
|
public static final String EVENT_ROLE_DISABLE = "ROLE.DISABLE";
|
||||||
public static final String EVENT_ROLE_PERMISSION_CREATE = "ROLE.PERMISSION.CREATE";
|
public static final String EVENT_ROLE_PERMISSION_CREATE = "ROLE.PERMISSION.CREATE";
|
||||||
public static final String EVENT_ROLE_PERMISSION_UPDATE = "ROLE.PERMISSION.UPDATE";
|
public static final String EVENT_ROLE_PERMISSION_UPDATE = "ROLE.PERMISSION.UPDATE";
|
||||||
public static final String EVENT_ROLE_PERMISSION_DELETE = "ROLE.PERMISSION.DELETE";
|
public static final String EVENT_ROLE_PERMISSION_DELETE = "ROLE.PERMISSION.DELETE";
|
||||||
@ -286,6 +292,7 @@ public class EventTypes {
|
|||||||
|
|
||||||
//register for user API and secret keys
|
//register for user API and secret keys
|
||||||
public static final String EVENT_REGISTER_FOR_SECRET_API_KEY = "REGISTER.USER.KEY";
|
public static final String EVENT_REGISTER_FOR_SECRET_API_KEY = "REGISTER.USER.KEY";
|
||||||
|
public static final String API_KEY_ACCESS_UPDATE = "API.KEY.ACCESS.UPDATE";
|
||||||
|
|
||||||
// Template Events
|
// Template Events
|
||||||
public static final String EVENT_TEMPLATE_CREATE = "TEMPLATE.CREATE";
|
public static final String EVENT_TEMPLATE_CREATE = "TEMPLATE.CREATE";
|
||||||
@ -333,6 +340,7 @@ public class EventTypes {
|
|||||||
public static final String EVENT_SNAPSHOT_OFF_PRIMARY = "SNAPSHOT.OFF_PRIMARY";
|
public static final String EVENT_SNAPSHOT_OFF_PRIMARY = "SNAPSHOT.OFF_PRIMARY";
|
||||||
public static final String EVENT_SNAPSHOT_DELETE = "SNAPSHOT.DELETE";
|
public static final String EVENT_SNAPSHOT_DELETE = "SNAPSHOT.DELETE";
|
||||||
public static final String EVENT_SNAPSHOT_REVERT = "SNAPSHOT.REVERT";
|
public static final String EVENT_SNAPSHOT_REVERT = "SNAPSHOT.REVERT";
|
||||||
|
public static final String EVENT_SNAPSHOT_EXTRACT = "SNAPSHOT.EXTRACT";
|
||||||
public static final String EVENT_SNAPSHOT_POLICY_CREATE = "SNAPSHOTPOLICY.CREATE";
|
public static final String EVENT_SNAPSHOT_POLICY_CREATE = "SNAPSHOTPOLICY.CREATE";
|
||||||
public static final String EVENT_SNAPSHOT_POLICY_UPDATE = "SNAPSHOTPOLICY.UPDATE";
|
public static final String EVENT_SNAPSHOT_POLICY_UPDATE = "SNAPSHOTPOLICY.UPDATE";
|
||||||
public static final String EVENT_SNAPSHOT_POLICY_DELETE = "SNAPSHOTPOLICY.DELETE";
|
public static final String EVENT_SNAPSHOT_POLICY_DELETE = "SNAPSHOTPOLICY.DELETE";
|
||||||
@ -390,6 +398,11 @@ public class EventTypes {
|
|||||||
public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE";
|
public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE";
|
||||||
public static final String EVENT_VLAN_IP_RANGE_UPDATE = "VLAN.IP.RANGE.UPDATE";
|
public static final String EVENT_VLAN_IP_RANGE_UPDATE = "VLAN.IP.RANGE.UPDATE";
|
||||||
|
|
||||||
|
// AS Number
|
||||||
|
public static final String EVENT_AS_RANGE_CREATE = "AS.RANGE.CREATE";
|
||||||
|
public static final String EVENT_AS_RANGE_DELETE = "AS.RANGE.DELETE";
|
||||||
|
public static final String EVENT_AS_NUMBER_RELEASE = "AS.NUMBER.RELEASE";
|
||||||
|
|
||||||
public static final String EVENT_MANAGEMENT_IP_RANGE_CREATE = "MANAGEMENT.IP.RANGE.CREATE";
|
public static final String EVENT_MANAGEMENT_IP_RANGE_CREATE = "MANAGEMENT.IP.RANGE.CREATE";
|
||||||
public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
|
public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
|
||||||
public static final String EVENT_MANAGEMENT_IP_RANGE_UPDATE = "MANAGEMENT.IP.RANGE.UPDATE";
|
public static final String EVENT_MANAGEMENT_IP_RANGE_UPDATE = "MANAGEMENT.IP.RANGE.UPDATE";
|
||||||
@ -448,6 +461,7 @@ public class EventTypes {
|
|||||||
public static final String EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE = "MAINT.PREPARE.PS";
|
public static final String EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE = "MAINT.PREPARE.PS";
|
||||||
|
|
||||||
// Primary storage pool
|
// Primary storage pool
|
||||||
|
public static final String EVENT_UPDATE_PRIMARY_STORAGE = "UPDATE.PS";
|
||||||
public static final String EVENT_ENABLE_PRIMARY_STORAGE = "ENABLE.PS";
|
public static final String EVENT_ENABLE_PRIMARY_STORAGE = "ENABLE.PS";
|
||||||
public static final String EVENT_DISABLE_PRIMARY_STORAGE = "DISABLE.PS";
|
public static final String EVENT_DISABLE_PRIMARY_STORAGE = "DISABLE.PS";
|
||||||
public static final String EVENT_SYNC_STORAGE_POOL = "SYNC.STORAGE.POOL";
|
public static final String EVENT_SYNC_STORAGE_POOL = "SYNC.STORAGE.POOL";
|
||||||
@ -722,6 +736,8 @@ public class EventTypes {
|
|||||||
|
|
||||||
// SystemVM
|
// SystemVM
|
||||||
public static final String EVENT_LIVE_PATCH_SYSTEMVM = "LIVE.PATCH.SYSTEM.VM";
|
public static final String EVENT_LIVE_PATCH_SYSTEMVM = "LIVE.PATCH.SYSTEM.VM";
|
||||||
|
//Purge resources
|
||||||
|
public static final String EVENT_PURGE_EXPUNGED_RESOURCES = "PURGE.EXPUNGED.RESOURCES";
|
||||||
|
|
||||||
// OBJECT STORE
|
// OBJECT STORE
|
||||||
public static final String EVENT_OBJECT_STORE_CREATE = "OBJECT.STORE.CREATE";
|
public static final String EVENT_OBJECT_STORE_CREATE = "OBJECT.STORE.CREATE";
|
||||||
@ -738,6 +754,37 @@ public class EventTypes {
|
|||||||
public static final String EVENT_QUOTA_TARIFF_DELETE = "QUOTA.TARIFF.DELETE";
|
public static final String EVENT_QUOTA_TARIFF_DELETE = "QUOTA.TARIFF.DELETE";
|
||||||
public static final String EVENT_QUOTA_TARIFF_UPDATE = "QUOTA.TARIFF.UPDATE";
|
public static final String EVENT_QUOTA_TARIFF_UPDATE = "QUOTA.TARIFF.UPDATE";
|
||||||
|
|
||||||
|
// Routing
|
||||||
|
public static final String EVENT_ZONE_IP4_SUBNET_CREATE = "ZONE.IP4.SUBNET.CREATE";
|
||||||
|
public static final String EVENT_ZONE_IP4_SUBNET_UPDATE = "ZONE.IP4.SUBNET.UPDATE";
|
||||||
|
public static final String EVENT_ZONE_IP4_SUBNET_DELETE = "ZONE.IP4.SUBNET.DELETE";
|
||||||
|
public static final String EVENT_ZONE_IP4_SUBNET_DEDICATE = "ZONE.IP4.SUBNET.DEDICATE";
|
||||||
|
public static final String EVENT_ZONE_IP4_SUBNET_RELEASE = "ZONE.IP4.SUBNET.RELEASE";
|
||||||
|
public static final String EVENT_IP4_GUEST_SUBNET_CREATE = "IP4.GUEST.SUBNET.CREATE";
|
||||||
|
public static final String EVENT_IP4_GUEST_SUBNET_DELETE = "IP4.GUEST.SUBNET.DELETE";
|
||||||
|
public static final String EVENT_ROUTING_IPV4_FIREWALL_RULE_CREATE = "ROUTING.IPV4.FIREWALL.RULE.CREATE";
|
||||||
|
public static final String EVENT_ROUTING_IPV4_FIREWALL_RULE_UPDATE = "ROUTING.IPV4.FIREWALL.RULE.UPDATE";
|
||||||
|
public static final String EVENT_ROUTING_IPV4_FIREWALL_RULE_DELETE = "ROUTING.IPV4.FIREWALL.RULE.DELETE";
|
||||||
|
public static final String EVENT_BGP_PEER_CREATE = "BGP.PEER.CREATE";
|
||||||
|
public static final String EVENT_BGP_PEER_UPDATE = "BGP.PEER.UPDATE";
|
||||||
|
public static final String EVENT_BGP_PEER_DELETE = "BGP.PEER.DELETE";
|
||||||
|
public static final String EVENT_BGP_PEER_DEDICATE = "BGP.PEER.DEDICATE";
|
||||||
|
public static final String EVENT_BGP_PEER_RELEASE = "BGP.PEER.RELEASE";
|
||||||
|
public static final String EVENT_NETWORK_BGP_PEER_UPDATE = "NETWORK.BGP.PEER.UPDATE";
|
||||||
|
public static final String EVENT_VPC_BGP_PEER_UPDATE = "VPC.BGP.PEER.UPDATE";
|
||||||
|
|
||||||
|
// SharedFS
|
||||||
|
public static final String EVENT_SHAREDFS_CREATE = "SHAREDFS.CREATE";
|
||||||
|
public static final String EVENT_SHAREDFS_START = "SHAREDFS.START";
|
||||||
|
public static final String EVENT_SHAREDFS_UPDATE = "SHAREDFS.UPDATE";
|
||||||
|
public static final String EVENT_SHAREDFS_CHANGE_SERVICE_OFFERING = "SHAREDFS.CHANGE.SERVICE.OFFERING";
|
||||||
|
public static final String EVENT_SHAREDFS_CHANGE_DISK_OFFERING = "SHAREDFS.CHANGE.DISK.OFFERING";
|
||||||
|
public static final String EVENT_SHAREDFS_STOP = "SHAREDFS.STOP";
|
||||||
|
public static final String EVENT_SHAREDFS_RESTART = "SHAREDFS.RESTART";
|
||||||
|
public static final String EVENT_SHAREDFS_DESTROY = "SHAREDFS.DESTROY";
|
||||||
|
public static final String EVENT_SHAREDFS_EXPUNGE = "SHAREDFS.EXPUNGE";
|
||||||
|
public static final String EVENT_SHAREDFS_RECOVER = "SHAREDFS.RECOVER";
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|
||||||
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
|
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
|
||||||
@ -839,6 +886,8 @@ public class EventTypes {
|
|||||||
entityEventDetails.put(EVENT_ROLE_UPDATE, Role.class);
|
entityEventDetails.put(EVENT_ROLE_UPDATE, Role.class);
|
||||||
entityEventDetails.put(EVENT_ROLE_DELETE, Role.class);
|
entityEventDetails.put(EVENT_ROLE_DELETE, Role.class);
|
||||||
entityEventDetails.put(EVENT_ROLE_IMPORT, Role.class);
|
entityEventDetails.put(EVENT_ROLE_IMPORT, Role.class);
|
||||||
|
entityEventDetails.put(EVENT_ROLE_ENABLE, Role.class);
|
||||||
|
entityEventDetails.put(EVENT_ROLE_DISABLE, Role.class);
|
||||||
entityEventDetails.put(EVENT_ROLE_PERMISSION_CREATE, RolePermission.class);
|
entityEventDetails.put(EVENT_ROLE_PERMISSION_CREATE, RolePermission.class);
|
||||||
entityEventDetails.put(EVENT_ROLE_PERMISSION_UPDATE, RolePermission.class);
|
entityEventDetails.put(EVENT_ROLE_PERMISSION_UPDATE, RolePermission.class);
|
||||||
entityEventDetails.put(EVENT_ROLE_PERMISSION_DELETE, RolePermission.class);
|
entityEventDetails.put(EVENT_ROLE_PERMISSION_DELETE, RolePermission.class);
|
||||||
@ -895,6 +944,7 @@ public class EventTypes {
|
|||||||
// Snapshots
|
// Snapshots
|
||||||
entityEventDetails.put(EVENT_SNAPSHOT_CREATE, Snapshot.class);
|
entityEventDetails.put(EVENT_SNAPSHOT_CREATE, Snapshot.class);
|
||||||
entityEventDetails.put(EVENT_SNAPSHOT_DELETE, Snapshot.class);
|
entityEventDetails.put(EVENT_SNAPSHOT_DELETE, Snapshot.class);
|
||||||
|
entityEventDetails.put(EVENT_SNAPSHOT_EXTRACT, Snapshot.class);
|
||||||
entityEventDetails.put(EVENT_SNAPSHOT_ON_PRIMARY, Snapshot.class);
|
entityEventDetails.put(EVENT_SNAPSHOT_ON_PRIMARY, Snapshot.class);
|
||||||
entityEventDetails.put(EVENT_SNAPSHOT_OFF_PRIMARY, Snapshot.class);
|
entityEventDetails.put(EVENT_SNAPSHOT_OFF_PRIMARY, Snapshot.class);
|
||||||
entityEventDetails.put(EVENT_SNAPSHOT_POLICY_CREATE, SnapshotPolicy.class);
|
entityEventDetails.put(EVENT_SNAPSHOT_POLICY_CREATE, SnapshotPolicy.class);
|
||||||
@ -999,6 +1049,7 @@ public class EventTypes {
|
|||||||
entityEventDetails.put(EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE, Host.class);
|
entityEventDetails.put(EVENT_MAINTENANCE_PREPARE_PRIMARY_STORAGE, Host.class);
|
||||||
|
|
||||||
// Primary storage pool
|
// Primary storage pool
|
||||||
|
entityEventDetails.put(EVENT_UPDATE_PRIMARY_STORAGE, StoragePool.class);
|
||||||
entityEventDetails.put(EVENT_ENABLE_PRIMARY_STORAGE, StoragePool.class);
|
entityEventDetails.put(EVENT_ENABLE_PRIMARY_STORAGE, StoragePool.class);
|
||||||
entityEventDetails.put(EVENT_DISABLE_PRIMARY_STORAGE, StoragePool.class);
|
entityEventDetails.put(EVENT_DISABLE_PRIMARY_STORAGE, StoragePool.class);
|
||||||
entityEventDetails.put(EVENT_CHANGE_STORAGE_POOL_SCOPE, StoragePool.class);
|
entityEventDetails.put(EVENT_CHANGE_STORAGE_POOL_SCOPE, StoragePool.class);
|
||||||
@ -1193,6 +1244,35 @@ public class EventTypes {
|
|||||||
entityEventDetails.put(EVENT_QUOTA_TARIFF_CREATE, QuotaTariff.class);
|
entityEventDetails.put(EVENT_QUOTA_TARIFF_CREATE, QuotaTariff.class);
|
||||||
entityEventDetails.put(EVENT_QUOTA_TARIFF_DELETE, QuotaTariff.class);
|
entityEventDetails.put(EVENT_QUOTA_TARIFF_DELETE, QuotaTariff.class);
|
||||||
entityEventDetails.put(EVENT_QUOTA_TARIFF_UPDATE, QuotaTariff.class);
|
entityEventDetails.put(EVENT_QUOTA_TARIFF_UPDATE, QuotaTariff.class);
|
||||||
|
|
||||||
|
// Routing
|
||||||
|
entityEventDetails.put(EVENT_ZONE_IP4_SUBNET_CREATE, DataCenterIpv4GuestSubnet.class);
|
||||||
|
entityEventDetails.put(EVENT_ZONE_IP4_SUBNET_UPDATE, DataCenterIpv4GuestSubnet.class);
|
||||||
|
entityEventDetails.put(EVENT_ZONE_IP4_SUBNET_DELETE, DataCenterIpv4GuestSubnet.class);
|
||||||
|
entityEventDetails.put(EVENT_ZONE_IP4_SUBNET_DEDICATE, DataCenterIpv4GuestSubnet.class);
|
||||||
|
entityEventDetails.put(EVENT_ZONE_IP4_SUBNET_RELEASE, DataCenterIpv4GuestSubnet.class);
|
||||||
|
entityEventDetails.put(EVENT_IP4_GUEST_SUBNET_CREATE, Ipv4GuestSubnetNetworkMap.class);
|
||||||
|
entityEventDetails.put(EVENT_IP4_GUEST_SUBNET_DELETE, Ipv4GuestSubnetNetworkMap.class);
|
||||||
|
entityEventDetails.put(EVENT_ROUTING_IPV4_FIREWALL_RULE_CREATE, FirewallRule.class);
|
||||||
|
entityEventDetails.put(EVENT_ROUTING_IPV4_FIREWALL_RULE_UPDATE, FirewallRule.class);
|
||||||
|
entityEventDetails.put(EVENT_ROUTING_IPV4_FIREWALL_RULE_DELETE, FirewallRule.class);
|
||||||
|
entityEventDetails.put(EVENT_BGP_PEER_CREATE, BgpPeer.class);
|
||||||
|
entityEventDetails.put(EVENT_BGP_PEER_UPDATE, BgpPeer.class);
|
||||||
|
entityEventDetails.put(EVENT_BGP_PEER_DELETE, BgpPeer.class);
|
||||||
|
entityEventDetails.put(EVENT_BGP_PEER_DEDICATE, BgpPeer.class);
|
||||||
|
entityEventDetails.put(EVENT_BGP_PEER_RELEASE, BgpPeer.class);
|
||||||
|
|
||||||
|
// SharedFS
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_CREATE, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_START, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_STOP, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_UPDATE, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_CHANGE_SERVICE_OFFERING, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_CHANGE_DISK_OFFERING, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_RESTART, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_DESTROY, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_EXPUNGE, SharedFS.class);
|
||||||
|
entityEventDetails.put(EVENT_SHAREDFS_RECOVER, SharedFS.class);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isNetworkEvent(String eventType) {
|
public static boolean isNetworkEvent(String eventType) {
|
||||||
|
|||||||
@ -16,6 +16,7 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.host;
|
package com.cloud.host;
|
||||||
|
|
||||||
|
import com.cloud.cpu.CPU;
|
||||||
import com.cloud.hypervisor.Hypervisor.HypervisorType;
|
import com.cloud.hypervisor.Hypervisor.HypervisorType;
|
||||||
import com.cloud.resource.ResourceState;
|
import com.cloud.resource.ResourceState;
|
||||||
import com.cloud.utils.fsm.StateObject;
|
import com.cloud.utils.fsm.StateObject;
|
||||||
@ -52,9 +53,12 @@ public interface Host extends StateObject<Status>, Identity, Partition, HAResour
|
|||||||
return strs;
|
return strs;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public static final String HOST_UEFI_ENABLE = "host.uefi.enable";
|
|
||||||
public static final String HOST_VOLUME_ENCRYPTION = "host.volume.encryption";
|
String HOST_UEFI_ENABLE = "host.uefi.enable";
|
||||||
public static final String HOST_INSTANCE_CONVERSION = "host.instance.conversion";
|
String HOST_VOLUME_ENCRYPTION = "host.volume.encryption";
|
||||||
|
String HOST_INSTANCE_CONVERSION = "host.instance.conversion";
|
||||||
|
String HOST_OVFTOOL_VERSION = "host.ovftool.version";
|
||||||
|
String HOST_VIRTV2V_VERSION = "host.virtv2v.version";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return name of the machine.
|
* @return name of the machine.
|
||||||
@ -208,4 +212,6 @@ public interface Host extends StateObject<Status>, Identity, Partition, HAResour
|
|||||||
boolean isDisabled();
|
boolean isDisabled();
|
||||||
|
|
||||||
ResourceState getResourceState();
|
ResourceState getResourceState();
|
||||||
|
|
||||||
|
CPU.CPUArch getArch();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -17,55 +17,67 @@
|
|||||||
package com.cloud.hypervisor;
|
package com.cloud.hypervisor;
|
||||||
|
|
||||||
import com.cloud.storage.Storage.ImageFormat;
|
import com.cloud.storage.Storage.ImageFormat;
|
||||||
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Objects;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.EnumSet;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import static com.cloud.hypervisor.Hypervisor.HypervisorType.Functionality.DirectDownloadTemplate;
|
||||||
|
import static com.cloud.hypervisor.Hypervisor.HypervisorType.Functionality.RootDiskSizeOverride;
|
||||||
|
import static com.cloud.hypervisor.Hypervisor.HypervisorType.Functionality.VmStorageMigration;
|
||||||
|
import static com.cloud.hypervisor.Hypervisor.HypervisorType.Functionality.VmStorageMigrationWithSnapshots;
|
||||||
|
|
||||||
public class Hypervisor {
|
public class Hypervisor {
|
||||||
|
public static class HypervisorType {
|
||||||
|
public enum Functionality {
|
||||||
|
DirectDownloadTemplate,
|
||||||
|
RootDiskSizeOverride,
|
||||||
|
VmStorageMigration,
|
||||||
|
VmStorageMigrationWithSnapshots
|
||||||
|
}
|
||||||
|
|
||||||
static Map<String, HypervisorType> hypervisorTypeMap;
|
private static final Map<String, HypervisorType> hypervisorTypeMap = new LinkedHashMap<>();
|
||||||
static Map<HypervisorType, ImageFormat> supportedImageFormatMap;
|
public static final HypervisorType None = new HypervisorType("None"); //for storage hosts
|
||||||
|
public static final HypervisorType XenServer = new HypervisorType("XenServer", ImageFormat.VHD, EnumSet.of(RootDiskSizeOverride, VmStorageMigration));
|
||||||
|
public static final HypervisorType KVM = new HypervisorType("KVM", ImageFormat.QCOW2, EnumSet.of(DirectDownloadTemplate, RootDiskSizeOverride, VmStorageMigration));
|
||||||
|
public static final HypervisorType VMware = new HypervisorType("VMware", ImageFormat.OVA, EnumSet.of(RootDiskSizeOverride, VmStorageMigration, VmStorageMigrationWithSnapshots));
|
||||||
|
public static final HypervisorType Hyperv = new HypervisorType("Hyperv");
|
||||||
|
public static final HypervisorType VirtualBox = new HypervisorType("VirtualBox");
|
||||||
|
public static final HypervisorType Parralels = new HypervisorType("Parralels");
|
||||||
|
public static final HypervisorType BareMetal = new HypervisorType("BareMetal");
|
||||||
|
public static final HypervisorType Simulator = new HypervisorType("Simulator", null, EnumSet.of(RootDiskSizeOverride, VmStorageMigration));
|
||||||
|
public static final HypervisorType Ovm = new HypervisorType("Ovm", ImageFormat.RAW);
|
||||||
|
public static final HypervisorType Ovm3 = new HypervisorType("Ovm3", ImageFormat.RAW);
|
||||||
|
public static final HypervisorType LXC = new HypervisorType("LXC");
|
||||||
|
public static final HypervisorType Custom = new HypervisorType("Custom", null, EnumSet.of(RootDiskSizeOverride));
|
||||||
|
public static final HypervisorType Any = new HypervisorType("Any"); /*If you don't care about the hypervisor type*/
|
||||||
|
private final String name;
|
||||||
|
private final ImageFormat imageFormat;
|
||||||
|
private final Set<Functionality> supportedFunctionalities;
|
||||||
|
|
||||||
public enum HypervisorType {
|
public HypervisorType(String name) {
|
||||||
None, //for storage hosts
|
this(name, null, EnumSet.noneOf(Functionality.class));
|
||||||
XenServer,
|
}
|
||||||
KVM,
|
|
||||||
VMware,
|
|
||||||
Hyperv,
|
|
||||||
VirtualBox,
|
|
||||||
Parralels,
|
|
||||||
BareMetal,
|
|
||||||
Simulator,
|
|
||||||
Ovm,
|
|
||||||
Ovm3,
|
|
||||||
LXC,
|
|
||||||
Custom,
|
|
||||||
|
|
||||||
Any; /*If you don't care about the hypervisor type*/
|
public HypervisorType(String name, ImageFormat imageFormat) {
|
||||||
|
this(name, imageFormat, EnumSet.noneOf(Functionality.class));
|
||||||
|
}
|
||||||
|
|
||||||
static {
|
public HypervisorType(String name, ImageFormat imageFormat, Set<Functionality> supportedFunctionalities) {
|
||||||
hypervisorTypeMap = new HashMap<>();
|
this.name = name;
|
||||||
hypervisorTypeMap.put("xenserver", HypervisorType.XenServer);
|
this.imageFormat = imageFormat;
|
||||||
hypervisorTypeMap.put("kvm", HypervisorType.KVM);
|
this.supportedFunctionalities = supportedFunctionalities;
|
||||||
hypervisorTypeMap.put("vmware", HypervisorType.VMware);
|
if (name.equals("Parralels")){ // typo in the original code
|
||||||
hypervisorTypeMap.put("hyperv", HypervisorType.Hyperv);
|
hypervisorTypeMap.put("parallels", this);
|
||||||
hypervisorTypeMap.put("virtualbox", HypervisorType.VirtualBox);
|
} else {
|
||||||
hypervisorTypeMap.put("parallels", HypervisorType.Parralels);
|
hypervisorTypeMap.putIfAbsent(name.toLowerCase(Locale.ROOT), this);
|
||||||
hypervisorTypeMap.put("baremetal", HypervisorType.BareMetal);
|
}
|
||||||
hypervisorTypeMap.put("simulator", HypervisorType.Simulator);
|
|
||||||
hypervisorTypeMap.put("ovm", HypervisorType.Ovm);
|
|
||||||
hypervisorTypeMap.put("lxc", HypervisorType.LXC);
|
|
||||||
hypervisorTypeMap.put("any", HypervisorType.Any);
|
|
||||||
hypervisorTypeMap.put("ovm3", HypervisorType.Ovm3);
|
|
||||||
hypervisorTypeMap.put("custom", HypervisorType.Custom);
|
|
||||||
|
|
||||||
supportedImageFormatMap = new HashMap<>();
|
|
||||||
supportedImageFormatMap.put(HypervisorType.XenServer, ImageFormat.VHD);
|
|
||||||
supportedImageFormatMap.put(HypervisorType.KVM, ImageFormat.QCOW2);
|
|
||||||
supportedImageFormatMap.put(HypervisorType.VMware, ImageFormat.OVA);
|
|
||||||
supportedImageFormatMap.put(HypervisorType.Ovm, ImageFormat.RAW);
|
|
||||||
supportedImageFormatMap.put(HypervisorType.Ovm3, ImageFormat.RAW);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static HypervisorType getType(String hypervisor) {
|
public static HypervisorType getType(String hypervisor) {
|
||||||
@ -75,24 +87,77 @@ public class Hypervisor {
|
|||||||
hypervisorTypeMap.getOrDefault(hypervisor.toLowerCase(Locale.ROOT), HypervisorType.None));
|
hypervisorTypeMap.getOrDefault(hypervisor.toLowerCase(Locale.ROOT), HypervisorType.None));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static HypervisorType[] values() {
|
||||||
|
return hypervisorTypeMap.values().toArray(HypervisorType[]::new).clone();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static HypervisorType valueOf(String name) {
|
||||||
|
if (StringUtils.isBlank(name)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
HypervisorType hypervisorType = hypervisorTypeMap.get(name.toLowerCase(Locale.ROOT));
|
||||||
|
if (hypervisorType == null) {
|
||||||
|
throw new IllegalArgumentException("HypervisorType '" + name + "' not found");
|
||||||
|
}
|
||||||
|
return hypervisorType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static List<HypervisorType> getListOfHypervisorsSupportingFunctionality(Functionality functionality) {
|
||||||
|
return hypervisorTypeMap.values().stream()
|
||||||
|
.filter(hypervisor -> hypervisor.supportedFunctionalities.contains(functionality))
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the display name of a hypervisor type in case the custom hypervisor is used,
|
* Returns the display name of a hypervisor type in case the custom hypervisor is used,
|
||||||
* using the 'hypervisor.custom.display.name' setting. Otherwise, returns hypervisor name
|
* using the 'hypervisor.custom.display.name' setting. Otherwise, returns hypervisor name
|
||||||
*/
|
*/
|
||||||
public String getHypervisorDisplayName() {
|
public String getHypervisorDisplayName() {
|
||||||
return !Hypervisor.HypervisorType.Custom.equals(this) ?
|
return HypervisorType.Custom.equals(this) ? HypervisorGuru.HypervisorCustomDisplayName.value() : name;
|
||||||
this.toString() :
|
|
||||||
HypervisorGuru.HypervisorCustomDisplayName.value();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This method really needs to be part of the properties of the hypervisor type itself.
|
* This method really needs to be part of the properties of the hypervisor type itself.
|
||||||
*
|
*
|
||||||
* @param hyperType
|
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public static ImageFormat getSupportedImageFormat(HypervisorType hyperType) {
|
public ImageFormat getSupportedImageFormat() {
|
||||||
return supportedImageFormatMap.getOrDefault(hyperType, null);
|
return imageFormat;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String name() {
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Make this method to be part of the properties of the hypervisor type itself.
|
||||||
|
*
|
||||||
|
* @return true if the hypervisor plugin support the specified functionality
|
||||||
|
*/
|
||||||
|
public boolean isFunctionalitySupported(Functionality functionality) {
|
||||||
|
return supportedFunctionalities.contains(functionality);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int hashCode() {
|
||||||
|
return Objects.hash(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean equals(Object o) {
|
||||||
|
if (o == this) {
|
||||||
|
return true;
|
||||||
|
} else if (o == null || getClass() != o.getClass()) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
HypervisorType that = (HypervisorType) o;
|
||||||
|
return Objects.equals(name, that.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return name;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -25,6 +25,7 @@ import com.cloud.utils.component.Adapter;
|
|||||||
public interface KubernetesServiceHelper extends Adapter {
|
public interface KubernetesServiceHelper extends Adapter {
|
||||||
|
|
||||||
ControlledEntity findByUuid(String uuid);
|
ControlledEntity findByUuid(String uuid);
|
||||||
|
ControlledEntity findByVmId(long vmId);
|
||||||
void checkVmCanBeDestroyed(UserVm userVm);
|
void checkVmCanBeDestroyed(UserVm userVm);
|
||||||
void cleanupForAccount(Account account);
|
void cleanupForAccount(Account account);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -97,4 +97,6 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity,
|
|||||||
|
|
||||||
void setRuleState(State ruleState);
|
void setRuleState(State ruleState);
|
||||||
|
|
||||||
|
boolean isForSystemVms();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -58,7 +58,7 @@ public interface Ipv6Service extends PluggableService, Configurable {
|
|||||||
|
|
||||||
Pair<Integer, Integer> getUsedTotalIpv6SubnetForZone(long zoneId);
|
Pair<Integer, Integer> getUsedTotalIpv6SubnetForZone(long zoneId);
|
||||||
|
|
||||||
Pair<String, String> preAllocateIpv6SubnetForNetwork(long zoneId) throws ResourceAllocationException;
|
Pair<String, String> preAllocateIpv6SubnetForNetwork(DataCenter zone) throws ResourceAllocationException;
|
||||||
|
|
||||||
void assignIpv6SubnetToNetwork(String subnet, long networkId);
|
void assignIpv6SubnetToNetwork(String subnet, long networkId);
|
||||||
|
|
||||||
|
|||||||
@ -103,7 +103,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
|
|||||||
public static final Service Vpn = new Service("Vpn", Capability.SupportedVpnProtocols, Capability.VpnTypes);
|
public static final Service Vpn = new Service("Vpn", Capability.SupportedVpnProtocols, Capability.VpnTypes);
|
||||||
public static final Service Dhcp = new Service("Dhcp", Capability.ExtraDhcpOptions);
|
public static final Service Dhcp = new Service("Dhcp", Capability.ExtraDhcpOptions);
|
||||||
public static final Service Dns = new Service("Dns", Capability.AllowDnsSuffixModification);
|
public static final Service Dns = new Service("Dns", Capability.AllowDnsSuffixModification);
|
||||||
public static final Service Gateway = new Service("Gateway");
|
public static final Service Gateway = new Service("Gateway", Capability.RedundantRouter);
|
||||||
public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols, Capability.MultipleIps, Capability.TrafficStatistics,
|
public static final Service Firewall = new Service("Firewall", Capability.SupportedProtocols, Capability.MultipleIps, Capability.TrafficStatistics,
|
||||||
Capability.SupportedTrafficDirection, Capability.SupportedEgressProtocols);
|
Capability.SupportedTrafficDirection, Capability.SupportedEgressProtocols);
|
||||||
public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedLBIsolation, Capability.SupportedProtocols,
|
public static final Service Lb = new Service("Lb", Capability.SupportedLBAlgorithms, Capability.SupportedLBIsolation, Capability.SupportedProtocols,
|
||||||
@ -205,6 +205,8 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
|
|||||||
//Add Tungsten Fabric provider
|
//Add Tungsten Fabric provider
|
||||||
public static final Provider Tungsten = new Provider("Tungsten", false);
|
public static final Provider Tungsten = new Provider("Tungsten", false);
|
||||||
|
|
||||||
|
public static final Provider Nsx = new Provider("Nsx", false);
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
private final boolean isExternal;
|
private final boolean isExternal;
|
||||||
|
|
||||||
@ -410,12 +412,16 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
|
|||||||
|
|
||||||
String getGateway();
|
String getGateway();
|
||||||
|
|
||||||
|
void setGateway(String gateway);
|
||||||
|
|
||||||
// "cidr" is the Cloudstack managed address space, all CloudStack managed vms get IP address from "cidr",
|
// "cidr" is the Cloudstack managed address space, all CloudStack managed vms get IP address from "cidr",
|
||||||
// In general "cidr" also serves as the network CIDR
|
// In general "cidr" also serves as the network CIDR
|
||||||
// But in case IP reservation is configured for a Guest network, "networkcidr" is the Effective network CIDR for that network,
|
// But in case IP reservation is configured for a Guest network, "networkcidr" is the Effective network CIDR for that network,
|
||||||
// "cidr" will still continue to be the effective address space for CloudStack managed vms in that Guest network
|
// "cidr" will still continue to be the effective address space for CloudStack managed vms in that Guest network
|
||||||
String getCidr();
|
String getCidr();
|
||||||
|
|
||||||
|
void setCidr(String cidr);
|
||||||
|
|
||||||
// "networkcidr" is the network CIDR of the guest network which uses IP reservation.
|
// "networkcidr" is the network CIDR of the guest network which uses IP reservation.
|
||||||
// It is the summation of "cidr" and the reservedIPrange(the address space used for non CloudStack purposes).
|
// It is the summation of "cidr" and the reservedIPrange(the address space used for non CloudStack purposes).
|
||||||
// For networks not configured with IP reservation, "networkcidr" is always null
|
// For networks not configured with IP reservation, "networkcidr" is always null
|
||||||
@ -427,6 +433,8 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
|
|||||||
|
|
||||||
long getDataCenterId();
|
long getDataCenterId();
|
||||||
|
|
||||||
|
long getAccountId();
|
||||||
|
|
||||||
long getNetworkOfferingId();
|
long getNetworkOfferingId();
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -499,4 +507,6 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I
|
|||||||
Integer getPublicMtu();
|
Integer getPublicMtu();
|
||||||
|
|
||||||
Integer getPrivateMtu();
|
Integer getPrivateMtu();
|
||||||
|
|
||||||
|
Integer getNetworkCidrSize();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -173,6 +173,8 @@ public interface NetworkModel {
|
|||||||
|
|
||||||
boolean isProviderSupportServiceInNetwork(long networkId, Service service, Provider provider);
|
boolean isProviderSupportServiceInNetwork(long networkId, Service service, Provider provider);
|
||||||
|
|
||||||
|
boolean isAnyServiceSupportedInNetwork(long networkId, Provider provider, Service... services);
|
||||||
|
|
||||||
boolean isProviderEnabledInPhysicalNetwork(long physicalNetowrkId, String providerName);
|
boolean isProviderEnabledInPhysicalNetwork(long physicalNetowrkId, String providerName);
|
||||||
|
|
||||||
String getNetworkTag(HypervisorType hType, Network network);
|
String getNetworkTag(HypervisorType hType, Network network);
|
||||||
@ -356,4 +358,8 @@ public interface NetworkModel {
|
|||||||
|
|
||||||
void verifyIp6DnsPair(final String ip6Dns1, final String ip6Dns2);
|
void verifyIp6DnsPair(final String ip6Dns1, final String ip6Dns2);
|
||||||
|
|
||||||
|
boolean isSecurityGroupSupportedForZone(Long zoneId);
|
||||||
|
|
||||||
|
boolean checkSecurityGroupSupportForNetwork(Account account, DataCenter zone, List<Long> networkIds,
|
||||||
|
List<Long> securityGroupsIds);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,10 +22,9 @@ import java.util.Date;
|
|||||||
import com.cloud.network.Networks.BroadcastDomainType;
|
import com.cloud.network.Networks.BroadcastDomainType;
|
||||||
import com.cloud.network.Networks.Mode;
|
import com.cloud.network.Networks.Mode;
|
||||||
import com.cloud.network.Networks.TrafficType;
|
import com.cloud.network.Networks.TrafficType;
|
||||||
import org.apache.log4j.Logger;
|
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
|
||||||
|
|
||||||
public class NetworkProfile implements Network {
|
public class NetworkProfile implements Network {
|
||||||
static final Logger s_logger = Logger.getLogger(NetworkProfile.class);
|
|
||||||
private final long id;
|
private final long id;
|
||||||
private final String uuid;
|
private final String uuid;
|
||||||
private final long dataCenterId;
|
private final long dataCenterId;
|
||||||
@ -43,8 +42,8 @@ public class NetworkProfile implements Network {
|
|||||||
private final Mode mode;
|
private final Mode mode;
|
||||||
private final BroadcastDomainType broadcastDomainType;
|
private final BroadcastDomainType broadcastDomainType;
|
||||||
private TrafficType trafficType;
|
private TrafficType trafficType;
|
||||||
private final String gateway;
|
private String gateway;
|
||||||
private final String cidr;
|
private String cidr;
|
||||||
private final String networkCidr;
|
private final String networkCidr;
|
||||||
private final String ip6Gateway;
|
private final String ip6Gateway;
|
||||||
private final String ip6Cidr;
|
private final String ip6Cidr;
|
||||||
@ -64,6 +63,7 @@ public class NetworkProfile implements Network {
|
|||||||
private final String guruName;
|
private final String guruName;
|
||||||
private boolean strechedL2Subnet;
|
private boolean strechedL2Subnet;
|
||||||
private String externalId;
|
private String externalId;
|
||||||
|
private Integer networkCidrSize;
|
||||||
|
|
||||||
public NetworkProfile(Network network) {
|
public NetworkProfile(Network network) {
|
||||||
id = network.getId();
|
id = network.getId();
|
||||||
@ -100,6 +100,7 @@ public class NetworkProfile implements Network {
|
|||||||
isRedundant = network.isRedundant();
|
isRedundant = network.isRedundant();
|
||||||
isRollingRestart = network.isRollingRestart();
|
isRollingRestart = network.isRollingRestart();
|
||||||
externalId = network.getExternalId();
|
externalId = network.getExternalId();
|
||||||
|
networkCidrSize = network.getNetworkCidrSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -212,11 +213,21 @@ public class NetworkProfile implements Network {
|
|||||||
return gateway;
|
return gateway;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setGateway(String gateway) {
|
||||||
|
this.gateway = gateway;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getCidr() {
|
public String getCidr() {
|
||||||
return cidr;
|
return cidr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setCidr(String cidr) {
|
||||||
|
this.cidr = cidr;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getNetworkCidr() {
|
public String getNetworkCidr() {
|
||||||
return networkCidr;
|
return networkCidr;
|
||||||
@ -369,4 +380,16 @@ public class NetworkProfile implements Network {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Integer getNetworkCidrSize() {
|
||||||
|
return networkCidrSize;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return String.format("NetworkProfile %s",
|
||||||
|
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
|
||||||
|
this, "id", "uuid", "name", "networkOfferingId"));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package com.cloud.network;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.cloud.dc.DataCenter;
|
||||||
import org.apache.cloudstack.acl.ControlledEntity;
|
import org.apache.cloudstack.acl.ControlledEntity;
|
||||||
import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
|
import org.apache.cloudstack.api.command.admin.address.ReleasePodIpCmdByAdmin;
|
||||||
import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
|
import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
|
||||||
@ -56,6 +57,7 @@ import com.cloud.utils.Pair;
|
|||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
import com.cloud.vm.Nic;
|
import com.cloud.vm.Nic;
|
||||||
import com.cloud.vm.NicSecondaryIp;
|
import com.cloud.vm.NicSecondaryIp;
|
||||||
|
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The NetworkService interface is the "public" api to entities that make requests to the orchestration engine
|
* The NetworkService interface is the "public" api to entities that make requests to the orchestration engine
|
||||||
@ -88,6 +90,8 @@ public interface NetworkService {
|
|||||||
|
|
||||||
IpAddress reserveIpAddress(Account account, Boolean displayIp, Long ipAddressId) throws ResourceAllocationException;
|
IpAddress reserveIpAddress(Account account, Boolean displayIp, Long ipAddressId) throws ResourceAllocationException;
|
||||||
|
|
||||||
|
IpAddress reserveIpAddressWithVlanDetail(Account account, DataCenter zone, Boolean displayIp, String vlanDetailKey) throws ResourceAllocationException;
|
||||||
|
|
||||||
boolean releaseReservedIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
|
boolean releaseReservedIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
|
||||||
|
|
||||||
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
|
boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException;
|
||||||
@ -259,4 +263,9 @@ public interface NetworkService {
|
|||||||
PublicIpQuarantine updatePublicIpAddressInQuarantine(UpdateQuarantinedIpCmd cmd);
|
PublicIpQuarantine updatePublicIpAddressInQuarantine(UpdateQuarantinedIpCmd cmd);
|
||||||
|
|
||||||
void removePublicIpAddressFromQuarantine(RemoveQuarantinedIpCmd cmd);
|
void removePublicIpAddressFromQuarantine(RemoveQuarantinedIpCmd cmd);
|
||||||
|
|
||||||
|
InternalLoadBalancerElementService getInternalLoadBalancerElementByType(VirtualRouterProvider.Type type);
|
||||||
|
InternalLoadBalancerElementService getInternalLoadBalancerElementByNetworkServiceProviderId(long networkProviderId);
|
||||||
|
InternalLoadBalancerElementService getInternalLoadBalancerElementById(long providerId);
|
||||||
|
List<InternalLoadBalancerElementService> getInternalLoadBalancerElements();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -78,7 +78,7 @@ public class Networks {
|
|||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public String getValueFrom(URI uri) {
|
public String getValueFrom(URI uri) {
|
||||||
return uri.getAuthority();
|
return uri == null ? null : uri.getAuthority();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Vswitch("vs", String.class), LinkLocal(null, null), Vnet("vnet", Long.class), Storage("storage", Integer.class), Lswitch("lswitch", String.class) {
|
Vswitch("vs", String.class), LinkLocal(null, null), Vnet("vnet", Long.class), Storage("storage", Integer.class), Lswitch("lswitch", String.class) {
|
||||||
@ -96,7 +96,7 @@ public class Networks {
|
|||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public String getValueFrom(URI uri) {
|
public String getValueFrom(URI uri) {
|
||||||
return uri.getSchemeSpecificPart();
|
return uri == null ? null : uri.getSchemeSpecificPart();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Mido("mido", String.class), Pvlan("pvlan", String.class),
|
Mido("mido", String.class), Pvlan("pvlan", String.class),
|
||||||
@ -128,7 +128,8 @@ public class Networks {
|
|||||||
},
|
},
|
||||||
UnDecided(null, null),
|
UnDecided(null, null),
|
||||||
OpenDaylight("opendaylight", String.class),
|
OpenDaylight("opendaylight", String.class),
|
||||||
TUNGSTEN("tf", String.class);
|
TUNGSTEN("tf", String.class),
|
||||||
|
NSX("nsx", String.class);
|
||||||
|
|
||||||
private final String scheme;
|
private final String scheme;
|
||||||
private final Class<?> type;
|
private final Class<?> type;
|
||||||
@ -175,7 +176,7 @@ public class Networks {
|
|||||||
* @return the scheme as BroadcastDomainType
|
* @return the scheme as BroadcastDomainType
|
||||||
*/
|
*/
|
||||||
public static BroadcastDomainType getSchemeValue(URI uri) {
|
public static BroadcastDomainType getSchemeValue(URI uri) {
|
||||||
return toEnumValue(uri.getScheme());
|
return toEnumValue(uri == null ? null : uri.getScheme());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -189,7 +190,7 @@ public class Networks {
|
|||||||
if (com.cloud.dc.Vlan.UNTAGGED.equalsIgnoreCase(str)) {
|
if (com.cloud.dc.Vlan.UNTAGGED.equalsIgnoreCase(str)) {
|
||||||
return Native;
|
return Native;
|
||||||
}
|
}
|
||||||
return getSchemeValue(new URI(str));
|
return getSchemeValue(str == null ? null : new URI(str));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -218,7 +219,7 @@ public class Networks {
|
|||||||
* @return the host part as String
|
* @return the host part as String
|
||||||
*/
|
*/
|
||||||
public String getValueFrom(URI uri) {
|
public String getValueFrom(URI uri) {
|
||||||
return uri.getHost();
|
return uri == null ? null : uri.getHost();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -241,7 +242,7 @@ public class Networks {
|
|||||||
* @throws URISyntaxException the string is not even an uri
|
* @throws URISyntaxException the string is not even an uri
|
||||||
*/
|
*/
|
||||||
public static String getValue(String uriString) throws URISyntaxException {
|
public static String getValue(String uriString) throws URISyntaxException {
|
||||||
return getValue(new URI(uriString));
|
return getValue(uriString == null ? null : new URI(uriString));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -21,7 +21,7 @@ import org.apache.cloudstack.api.InternalIdentity;
|
|||||||
|
|
||||||
public interface VirtualRouterProvider extends InternalIdentity, Identity {
|
public interface VirtualRouterProvider extends InternalIdentity, Identity {
|
||||||
public enum Type {
|
public enum Type {
|
||||||
VirtualRouter, ElasticLoadBalancerVm, VPCVirtualRouter, InternalLbVm, NetScalerVm
|
VirtualRouter, ElasticLoadBalancerVm, VPCVirtualRouter, InternalLbVm, NetScalerVm, Nsx
|
||||||
}
|
}
|
||||||
|
|
||||||
public Type getType();
|
public Type getType();
|
||||||
|
|||||||
@ -0,0 +1,31 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.network.element;
|
||||||
|
|
||||||
|
import com.cloud.exception.ResourceUnavailableException;
|
||||||
|
import com.cloud.network.Network;
|
||||||
|
import com.cloud.network.vpc.Vpc;
|
||||||
|
|
||||||
|
import org.apache.cloudstack.network.BgpPeer;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
public interface BgpServiceProvider extends NetworkElement {
|
||||||
|
|
||||||
|
boolean applyBgpPeers(Vpc vpc, Network network, List<? extends BgpPeer> bgpPeers) throws ResourceUnavailableException;
|
||||||
|
|
||||||
|
}
|
||||||
@ -48,4 +48,7 @@ public interface LoadBalancingServiceProvider extends NetworkElement, IpDeployin
|
|||||||
List<LoadBalancerTO> updateHealthChecks(Network network, List<LoadBalancingRule> lbrules);
|
List<LoadBalancerTO> updateHealthChecks(Network network, List<LoadBalancingRule> lbrules);
|
||||||
|
|
||||||
boolean handlesOnlyRulesInTransitionState();
|
boolean handlesOnlyRulesInTransitionState();
|
||||||
|
|
||||||
|
default void expungeLbVmRefs(List<Long> vmIds, Long batchSize) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import java.util.List;
|
|||||||
import com.cloud.exception.ResourceUnavailableException;
|
import com.cloud.exception.ResourceUnavailableException;
|
||||||
import com.cloud.network.Network;
|
import com.cloud.network.Network;
|
||||||
import com.cloud.network.vpc.NetworkACLItem;
|
import com.cloud.network.vpc.NetworkACLItem;
|
||||||
|
import com.cloud.network.vpc.Vpc;
|
||||||
|
|
||||||
public interface NetworkACLServiceProvider extends NetworkElement {
|
public interface NetworkACLServiceProvider extends NetworkElement {
|
||||||
|
|
||||||
@ -32,4 +33,6 @@ public interface NetworkACLServiceProvider extends NetworkElement {
|
|||||||
*/
|
*/
|
||||||
boolean applyNetworkACLs(Network config, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
|
boolean applyNetworkACLs(Network config, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
|
||||||
|
|
||||||
|
boolean reorderAclRules(Vpc vpc, List<? extends Network> networks, List<? extends NetworkACLItem> networkACLItems);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,6 +22,7 @@ import com.cloud.deploy.DeployDestination;
|
|||||||
import com.cloud.exception.ConcurrentOperationException;
|
import com.cloud.exception.ConcurrentOperationException;
|
||||||
import com.cloud.exception.InsufficientCapacityException;
|
import com.cloud.exception.InsufficientCapacityException;
|
||||||
import com.cloud.exception.ResourceUnavailableException;
|
import com.cloud.exception.ResourceUnavailableException;
|
||||||
|
import com.cloud.network.IpAddress;
|
||||||
import com.cloud.network.vpc.NetworkACLItem;
|
import com.cloud.network.vpc.NetworkACLItem;
|
||||||
import com.cloud.network.vpc.PrivateGateway;
|
import com.cloud.network.vpc.PrivateGateway;
|
||||||
import com.cloud.network.vpc.StaticRouteProfile;
|
import com.cloud.network.vpc.StaticRouteProfile;
|
||||||
@ -52,4 +53,6 @@ public interface VpcProvider extends NetworkElement {
|
|||||||
boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException;
|
boolean applyStaticRoutes(Vpc vpc, List<StaticRouteProfile> routes) throws ResourceUnavailableException;
|
||||||
|
|
||||||
boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
|
boolean applyACLItemsToPrivateGw(PrivateGateway gateway, List<? extends NetworkACLItem> rules) throws ResourceUnavailableException;
|
||||||
|
|
||||||
|
boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -79,20 +79,24 @@ public interface NetworkGuru extends Adapter {
|
|||||||
* be used to make determination can be isolation methods, services
|
* be used to make determination can be isolation methods, services
|
||||||
* provided on the guest network and the service provider that's on the
|
* provided on the guest network and the service provider that's on the
|
||||||
* guest network.
|
* guest network.
|
||||||
*
|
* <p>
|
||||||
* If a network is already fully substantiated with the necessary resources
|
* If a network is already fully substantiated with the necessary resources
|
||||||
* during this design phase, then the state should be set to Setup. If
|
* during this design phase, then the state should be set to Setup. If
|
||||||
* the resources are not allocated at this point, the state should be set
|
* the resources are not allocated at this point, the state should be set
|
||||||
* to Allocated.
|
* to Allocated.
|
||||||
*
|
*
|
||||||
* @param offering network offering that contains the package of services
|
* @param offering network offering that contains the package of services
|
||||||
* the end user intends to use on that network.
|
* the end user intends to use on that network.
|
||||||
* @param plan where is this network being deployed.
|
* @param plan where is this network being deployed.
|
||||||
* @param userSpecified user specified parameters for this network.
|
* @param userSpecified user specified parameters for this network.
|
||||||
* @param owner owner of this network.
|
* @param name
|
||||||
|
* @param vpcId
|
||||||
|
* @param owner owner of this network.
|
||||||
* @return Network
|
* @return Network
|
||||||
*/
|
*/
|
||||||
Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner);
|
Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, String name, Long vpcId, Account owner);
|
||||||
|
|
||||||
|
void setup(Network network, long networkId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* For guest networks that are in Allocated state after the design stage,
|
* For guest networks that are in Allocated state after the design stage,
|
||||||
|
|||||||
@ -63,6 +63,10 @@ public class LoadBalancingRule {
|
|||||||
return lb.getId();
|
return lb.getId();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LoadBalancer getLb() {
|
||||||
|
return lb;
|
||||||
|
}
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return lb.getName();
|
return lb.getName();
|
||||||
}
|
}
|
||||||
|
|||||||
34
api/src/main/java/com/cloud/network/nsx/NsxProvider.java
Normal file
34
api/src/main/java/com/cloud/network/nsx/NsxProvider.java
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.network.nsx;
|
||||||
|
|
||||||
|
import org.apache.cloudstack.api.Identity;
|
||||||
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
|
public interface NsxProvider extends InternalIdentity, Identity {
|
||||||
|
String getHostname();
|
||||||
|
|
||||||
|
String getPort();
|
||||||
|
String getProviderName();
|
||||||
|
String getUsername();
|
||||||
|
long getZoneId();
|
||||||
|
|
||||||
|
String getTier0Gateway();
|
||||||
|
String getEdgeCluster();
|
||||||
|
|
||||||
|
String getTransportZone();
|
||||||
|
}
|
||||||
36
api/src/main/java/com/cloud/network/nsx/NsxService.java
Normal file
36
api/src/main/java/com/cloud/network/nsx/NsxService.java
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
// Licensed to the Apache Software Foundation (ASF) under one
|
||||||
|
// or more contributor license agreements. See the NOTICE file
|
||||||
|
// distributed with this work for additional information
|
||||||
|
// regarding copyright ownership. The ASF licenses this file
|
||||||
|
// to you under the Apache License, Version 2.0 (the
|
||||||
|
// "License"); you may not use this file except in compliance
|
||||||
|
// with the License. You may obtain a copy of the License at
|
||||||
|
//
|
||||||
|
// http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
//
|
||||||
|
// Unless required by applicable law or agreed to in writing,
|
||||||
|
// software distributed under the License is distributed on an
|
||||||
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||||
|
// KIND, either express or implied. See the License for the
|
||||||
|
// specific language governing permissions and limitations
|
||||||
|
// under the License.
|
||||||
|
package com.cloud.network.nsx;
|
||||||
|
|
||||||
|
import com.cloud.network.IpAddress;
|
||||||
|
import com.cloud.network.vpc.Vpc;
|
||||||
|
import org.apache.cloudstack.framework.config.ConfigKey;
|
||||||
|
|
||||||
|
public interface NsxService {
|
||||||
|
|
||||||
|
ConfigKey<Integer> NSX_API_FAILURE_RETRIES = new ConfigKey<>("Advanced", Integer.class,
|
||||||
|
"nsx.api.failure.retries", "30",
|
||||||
|
"Number of retries for NSX API operations in case of failures",
|
||||||
|
true, ConfigKey.Scope.Zone);
|
||||||
|
ConfigKey<Integer> NSX_API_FAILURE_INTERVAL = new ConfigKey<>("Advanced", Integer.class,
|
||||||
|
"nsx.api.failure.interval", "60",
|
||||||
|
"Waiting time (in seconds) before retrying an NSX API operation in case of failure",
|
||||||
|
true, ConfigKey.Scope.Zone);
|
||||||
|
|
||||||
|
boolean createVpcNetwork(Long zoneId, long accountId, long domainId, Long vpcId, String vpcName, boolean sourceNatEnabled);
|
||||||
|
boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address);
|
||||||
|
}
|
||||||
@ -18,6 +18,7 @@ package com.cloud.network.vpc;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
|
import com.cloud.offering.NetworkOffering;
|
||||||
import org.apache.cloudstack.api.Identity;
|
import org.apache.cloudstack.api.Identity;
|
||||||
import org.apache.cloudstack.api.InternalIdentity;
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
@ -29,6 +30,8 @@ public interface VpcOffering extends InternalIdentity, Identity {
|
|||||||
public static final String defaultVPCOfferingName = "Default VPC offering";
|
public static final String defaultVPCOfferingName = "Default VPC offering";
|
||||||
public static final String defaultVPCNSOfferingName = "Default VPC offering with Netscaler";
|
public static final String defaultVPCNSOfferingName = "Default VPC offering with Netscaler";
|
||||||
public static final String redundantVPCOfferingName = "Redundant VPC offering";
|
public static final String redundantVPCOfferingName = "Redundant VPC offering";
|
||||||
|
public static final String DEFAULT_VPC_NAT_NSX_OFFERING_NAME = "VPC offering with NSX - NAT Mode";
|
||||||
|
public static final String DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME = "VPC offering with NSX - Route Mode";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
@ -53,6 +56,10 @@ public interface VpcOffering extends InternalIdentity, Identity {
|
|||||||
*/
|
*/
|
||||||
boolean isDefault();
|
boolean isDefault();
|
||||||
|
|
||||||
|
boolean isForNsx();
|
||||||
|
|
||||||
|
NetworkOffering.NetworkMode getNetworkMode();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return service offering id used by VPC virtual router
|
* @return service offering id used by VPC virtual router
|
||||||
*/
|
*/
|
||||||
@ -73,4 +80,8 @@ public interface VpcOffering extends InternalIdentity, Identity {
|
|||||||
Date getRemoved();
|
Date getRemoved();
|
||||||
|
|
||||||
Date getCreated();
|
Date getCreated();
|
||||||
|
|
||||||
|
NetworkOffering.RoutingMode getRoutingMode();
|
||||||
|
|
||||||
|
Boolean isSpecifyAsNumber();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -24,6 +24,7 @@ import org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;
|
|||||||
import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
|
import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
|
||||||
import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
|
import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
|
||||||
|
|
||||||
|
import com.cloud.offering.NetworkOffering;
|
||||||
import com.cloud.utils.Pair;
|
import com.cloud.utils.Pair;
|
||||||
import com.cloud.utils.net.NetUtils;
|
import com.cloud.utils.net.NetUtils;
|
||||||
|
|
||||||
@ -36,7 +37,10 @@ public interface VpcProvisioningService {
|
|||||||
VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
|
VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
|
||||||
Map<String, List<String>> serviceProviders,
|
Map<String, List<String>> serviceProviders,
|
||||||
Map serviceCapabilitystList, NetUtils.InternetProtocol internetProtocol,
|
Map serviceCapabilitystList, NetUtils.InternetProtocol internetProtocol,
|
||||||
Long serviceOfferingId, List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state);
|
Long serviceOfferingId, Boolean forNsx, NetworkOffering.NetworkMode networkMode,
|
||||||
|
List<Long> domainIds, List<Long> zoneIds, VpcOffering.State state,
|
||||||
|
NetworkOffering.RoutingMode routingMode, boolean specifyAsNumber);
|
||||||
|
|
||||||
|
|
||||||
Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(ListVPCOfferingsCmd cmd);
|
Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(ListVPCOfferingsCmd cmd);
|
||||||
|
|
||||||
|
|||||||
@ -56,7 +56,8 @@ public interface VpcService {
|
|||||||
* @throws ResourceAllocationException TODO
|
* @throws ResourceAllocationException TODO
|
||||||
*/
|
*/
|
||||||
Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain,
|
Vpc createVpc(long zoneId, long vpcOffId, long vpcOwnerId, String vpcName, String displayText, String cidr, String networkDomain,
|
||||||
String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Boolean displayVpc, Integer publicMtu)
|
String ip4Dns1, String ip4Dns2, String ip6Dns1, String ip6Dns2, Boolean displayVpc, Integer publicMtu, Integer cidrSize,
|
||||||
|
Long asNumber, List<Long> bgpPeerIds)
|
||||||
throws ResourceAllocationException;
|
throws ResourceAllocationException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public interface RemoteAccessVpnService {
|
|||||||
|
|
||||||
VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
|
VpnUser addVpnUser(long vpnOwnerId, String userName, String password);
|
||||||
|
|
||||||
boolean removeVpnUser(long vpnOwnerId, String userName, Account caller);
|
boolean removeVpnUser(Account vpnOwner, String userName, Account caller);
|
||||||
|
|
||||||
List<? extends VpnUser> listVpnUsers(long vpnOwnerId, String userName);
|
List<? extends VpnUser> listVpnUsers(long vpnOwnerId, String userName);
|
||||||
|
|
||||||
|
|||||||
@ -43,6 +43,15 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
|
|||||||
InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RelatedNetworkOffering, domainid, zoneid, pvlanType, internetProtocol
|
InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RelatedNetworkOffering, domainid, zoneid, pvlanType, internetProtocol
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public enum NetworkMode {
|
||||||
|
NATTED,
|
||||||
|
ROUTED
|
||||||
|
}
|
||||||
|
|
||||||
|
enum RoutingMode {
|
||||||
|
Static, Dynamic
|
||||||
|
}
|
||||||
|
|
||||||
public final static String SystemPublicNetwork = "System-Public-Network";
|
public final static String SystemPublicNetwork = "System-Public-Network";
|
||||||
public final static String SystemControlNetwork = "System-Control-Network";
|
public final static String SystemControlNetwork = "System-Control-Network";
|
||||||
public final static String SystemManagementNetwork = "System-Management-Network";
|
public final static String SystemManagementNetwork = "System-Management-Network";
|
||||||
@ -52,6 +61,11 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
|
|||||||
|
|
||||||
public final static String DefaultSharedNetworkOfferingWithSGService = "DefaultSharedNetworkOfferingWithSGService";
|
public final static String DefaultSharedNetworkOfferingWithSGService = "DefaultSharedNetworkOfferingWithSGService";
|
||||||
public static final String DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE = "DefaultTungstenSharedNetworkOfferingWithSGService";
|
public static final String DEFAULT_TUNGSTEN_SHARED_NETWORK_OFFERING_WITH_SGSERVICE = "DefaultTungstenSharedNetworkOfferingWithSGService";
|
||||||
|
public static final String DEFAULT_NAT_NSX_OFFERING_FOR_VPC = "DefaultNATNSXNetworkOfferingForVpc";
|
||||||
|
public static final String DEFAULT_NAT_NSX_OFFERING_FOR_VPC_WITH_ILB = "DefaultNATNSXNetworkOfferingForVpcWithInternalLB";
|
||||||
|
public static final String DEFAULT_ROUTED_NSX_OFFERING_FOR_VPC = "DefaultRoutedNSXNetworkOfferingForVpc";
|
||||||
|
public static final String DEFAULT_NAT_NSX_OFFERING = "DefaultNATNSXNetworkOffering";
|
||||||
|
public static final String DEFAULT_ROUTED_NSX_OFFERING = "DefaultRoutedNSXNetworkOffering";
|
||||||
public final static String QuickCloudNoServices = "QuickCloudNoServices";
|
public final static String QuickCloudNoServices = "QuickCloudNoServices";
|
||||||
public final static String DefaultIsolatedNetworkOfferingWithSourceNatService = "DefaultIsolatedNetworkOfferingWithSourceNatService";
|
public final static String DefaultIsolatedNetworkOfferingWithSourceNatService = "DefaultIsolatedNetworkOfferingWithSourceNatService";
|
||||||
public final static String OvsIsolatedNetworkOfferingWithSourceNatService = "OvsIsolatedNetworkOfferingWithSourceNatService";
|
public final static String OvsIsolatedNetworkOfferingWithSourceNatService = "OvsIsolatedNetworkOfferingWithSourceNatService";
|
||||||
@ -90,6 +104,10 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
|
|||||||
|
|
||||||
boolean isForTungsten();
|
boolean isForTungsten();
|
||||||
|
|
||||||
|
boolean isForNsx();
|
||||||
|
|
||||||
|
NetworkMode getNetworkMode();
|
||||||
|
|
||||||
TrafficType getTrafficType();
|
TrafficType getTrafficType();
|
||||||
|
|
||||||
boolean isSpecifyVlan();
|
boolean isSpecifyVlan();
|
||||||
@ -151,4 +169,8 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity,
|
|||||||
String getServicePackage();
|
String getServicePackage();
|
||||||
|
|
||||||
Date getCreated();
|
Date getCreated();
|
||||||
|
|
||||||
|
RoutingMode getRoutingMode();
|
||||||
|
|
||||||
|
Boolean isSpecifyAsNumber();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -33,6 +33,9 @@ public interface ServiceOffering extends InfrastructureEntity, InternalIdentity,
|
|||||||
static final String internalLbVmDefaultOffUniqueName = "Cloud.Com-InternalLBVm";
|
static final String internalLbVmDefaultOffUniqueName = "Cloud.Com-InternalLBVm";
|
||||||
// leaving cloud.com references as these are identifyers and no real world addresses (check against DB)
|
// leaving cloud.com references as these are identifyers and no real world addresses (check against DB)
|
||||||
|
|
||||||
|
|
||||||
|
static final String PURGE_DB_ENTITIES_KEY = "purge.db.entities";
|
||||||
|
|
||||||
enum State {
|
enum State {
|
||||||
Inactive, Active,
|
Inactive, Active,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -16,6 +16,7 @@
|
|||||||
// under the License.
|
// under the License.
|
||||||
package com.cloud.org;
|
package com.cloud.org;
|
||||||
|
|
||||||
|
import com.cloud.cpu.CPU;
|
||||||
import com.cloud.hypervisor.Hypervisor.HypervisorType;
|
import com.cloud.hypervisor.Hypervisor.HypervisorType;
|
||||||
import com.cloud.org.Managed.ManagedState;
|
import com.cloud.org.Managed.ManagedState;
|
||||||
import org.apache.cloudstack.kernel.Partition;
|
import org.apache.cloudstack.kernel.Partition;
|
||||||
@ -38,4 +39,6 @@ public interface Cluster extends Grouping, Partition {
|
|||||||
AllocationState getAllocationState();
|
AllocationState getAllocationState();
|
||||||
|
|
||||||
ManagedState getManagedState();
|
ManagedState getManagedState();
|
||||||
|
|
||||||
|
CPU.CPUArch getArch();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package com.cloud.region.ha;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.cloud.user.Account;
|
||||||
import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd;
|
import org.apache.cloudstack.api.command.user.region.ha.gslb.AssignToGlobalLoadBalancerRuleCmd;
|
||||||
import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd;
|
import org.apache.cloudstack.api.command.user.region.ha.gslb.CreateGlobalLoadBalancerRuleCmd;
|
||||||
import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd;
|
import org.apache.cloudstack.api.command.user.region.ha.gslb.DeleteGlobalLoadBalancerRuleCmd;
|
||||||
@ -39,7 +40,7 @@ public interface GlobalLoadBalancingRulesService {
|
|||||||
|
|
||||||
GlobalLoadBalancerRule updateGlobalLoadBalancerRule(UpdateGlobalLoadBalancerRuleCmd updateGslbCmd);
|
GlobalLoadBalancerRule updateGlobalLoadBalancerRule(UpdateGlobalLoadBalancerRuleCmd updateGslbCmd);
|
||||||
|
|
||||||
boolean revokeAllGslbRulesForAccount(com.cloud.user.Account caller, long accountId) throws com.cloud.exception.ResourceUnavailableException;
|
boolean revokeAllGslbRulesForAccount(com.cloud.user.Account caller, Account account) throws com.cloud.exception.ResourceUnavailableException;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* methods for managing sites participating in global load balancing
|
* methods for managing sites participating in global load balancing
|
||||||
|
|||||||
@ -32,6 +32,8 @@ public interface ManagementServerHostStats {
|
|||||||
|
|
||||||
String getManagementServerHostUuid();
|
String getManagementServerHostUuid();
|
||||||
|
|
||||||
|
long getManagementServerRunId();
|
||||||
|
|
||||||
long getSessions();
|
long getSessions();
|
||||||
|
|
||||||
double getCpuUtilization();
|
double getCpuUtilization();
|
||||||
|
|||||||
@ -20,7 +20,6 @@ import java.util.ArrayList;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import com.cloud.user.UserData;
|
|
||||||
import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
|
import org.apache.cloudstack.api.command.admin.cluster.ListClustersCmd;
|
||||||
import org.apache.cloudstack.api.command.admin.config.ListCfgGroupsByCmd;
|
import org.apache.cloudstack.api.command.admin.config.ListCfgGroupsByCmd;
|
||||||
import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
|
import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd;
|
||||||
@ -66,6 +65,7 @@ import org.apache.cloudstack.api.command.user.vm.GetVMPasswordCmd;
|
|||||||
import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;
|
import org.apache.cloudstack.api.command.user.vmgroup.UpdateVMGroupCmd;
|
||||||
import org.apache.cloudstack.config.Configuration;
|
import org.apache.cloudstack.config.Configuration;
|
||||||
import org.apache.cloudstack.config.ConfigurationGroup;
|
import org.apache.cloudstack.config.ConfigurationGroup;
|
||||||
|
import org.apache.cloudstack.framework.config.ConfigKey;
|
||||||
|
|
||||||
import com.cloud.alert.Alert;
|
import com.cloud.alert.Alert;
|
||||||
import com.cloud.capacity.Capacity;
|
import com.cloud.capacity.Capacity;
|
||||||
@ -85,6 +85,7 @@ import com.cloud.storage.GuestOSHypervisor;
|
|||||||
import com.cloud.storage.GuestOsCategory;
|
import com.cloud.storage.GuestOsCategory;
|
||||||
import com.cloud.storage.StoragePool;
|
import com.cloud.storage.StoragePool;
|
||||||
import com.cloud.user.SSHKeyPair;
|
import com.cloud.user.SSHKeyPair;
|
||||||
|
import com.cloud.user.UserData;
|
||||||
import com.cloud.utils.Pair;
|
import com.cloud.utils.Pair;
|
||||||
import com.cloud.utils.Ternary;
|
import com.cloud.utils.Ternary;
|
||||||
import com.cloud.vm.InstanceGroup;
|
import com.cloud.vm.InstanceGroup;
|
||||||
@ -98,6 +99,14 @@ import com.cloud.vm.VirtualMachine.Type;
|
|||||||
public interface ManagementService {
|
public interface ManagementService {
|
||||||
static final String Name = "management-server";
|
static final String Name = "management-server";
|
||||||
|
|
||||||
|
ConfigKey<Boolean> JsInterpretationEnabled = new ConfigKey<>("Hidden"
|
||||||
|
, Boolean.class
|
||||||
|
, "js.interpretation.enabled"
|
||||||
|
, "false"
|
||||||
|
, "Enable/Disable all JavaScript interpretation related functionalities to create or update Javascript rules."
|
||||||
|
, false
|
||||||
|
, ConfigKey.Scope.Global);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* returns the a map of the names/values in the configuration table
|
* returns the a map of the names/values in the configuration table
|
||||||
*
|
*
|
||||||
@ -481,4 +490,6 @@ public interface ManagementService {
|
|||||||
|
|
||||||
Pair<Boolean, String> patchSystemVM(PatchSystemVMCmd cmd);
|
Pair<Boolean, String> patchSystemVM(PatchSystemVMCmd cmd);
|
||||||
|
|
||||||
|
void checkJsInterpretationAllowedIfNeededForParameterValue(String paramName, boolean paramValue);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -18,6 +18,7 @@ package com.cloud.server;
|
|||||||
|
|
||||||
public interface ResourceManagerUtil {
|
public interface ResourceManagerUtil {
|
||||||
long getResourceId(String resourceId, ResourceTag.ResourceObjectType resourceType);
|
long getResourceId(String resourceId, ResourceTag.ResourceObjectType resourceType);
|
||||||
|
long getResourceId(String resourceId, ResourceTag.ResourceObjectType resourceType, boolean checkAccess);
|
||||||
String getUuid(String resourceId, ResourceTag.ResourceObjectType resourceType);
|
String getUuid(String resourceId, ResourceTag.ResourceObjectType resourceType);
|
||||||
ResourceTag.ResourceObjectType getResourceType(String resourceTypeStr);
|
ResourceTag.ResourceObjectType getResourceType(String resourceTypeStr);
|
||||||
void checkResourceAccessible(Long accountId, Long domainId, String exceptionMessage);
|
void checkResourceAccessible(Long accountId, Long domainId, String exceptionMessage);
|
||||||
|
|||||||
@ -20,6 +20,7 @@ package com.cloud.storage;
|
|||||||
|
|
||||||
import com.cloud.utils.exception.CloudRuntimeException;
|
import com.cloud.utils.exception.CloudRuntimeException;
|
||||||
|
|
||||||
|
|
||||||
public enum DataStoreRole {
|
public enum DataStoreRole {
|
||||||
Primary("primary"), Image("image"), ImageCache("imagecache"), Backup("backup"), Object("object");
|
Primary("primary"), Image("image"), ImageCache("imagecache"), Backup("backup"), Object("object");
|
||||||
|
|
||||||
|
|||||||
@ -150,6 +150,17 @@ public class Storage {
|
|||||||
Storage
|
Storage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* StoragePoolTypes carry some details about the format and capabilities of a storage pool. While not necessarily a
|
||||||
|
* 1:1 with PrimaryDataStoreDriver (and for KVM agent, KVMStoragePool and StorageAdaptor) implementations, it is
|
||||||
|
* often used to decide which storage plugin or storage command to call, so it may be necessary for new storage
|
||||||
|
* plugins to add a StoragePoolType. This can be done by adding it below, or by creating a new public static final
|
||||||
|
* instance of StoragePoolType in the plugin itself, which registers it with the map.
|
||||||
|
*
|
||||||
|
* Note that if the StoragePoolType is for KVM and defined in plugin code rather than below, care must be taken to
|
||||||
|
* ensure this is available on the agent side as well. This is best done by defining the StoragePoolType in a common
|
||||||
|
* package available on both management server and agent plugin jars.
|
||||||
|
*/
|
||||||
public static enum StoragePoolType {
|
public static enum StoragePoolType {
|
||||||
Filesystem(false, true, EncryptionSupport.Hypervisor), // local directory
|
Filesystem(false, true, EncryptionSupport.Hypervisor), // local directory
|
||||||
NetworkFilesystem(true, true, EncryptionSupport.Hypervisor), // NFS
|
NetworkFilesystem(true, true, EncryptionSupport.Hypervisor), // NFS
|
||||||
|
|||||||
@ -95,6 +95,10 @@ public interface StorageService {
|
|||||||
|
|
||||||
StoragePool updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
|
StoragePool updateStoragePool(UpdateStoragePoolCmd cmd) throws IllegalArgumentException;
|
||||||
|
|
||||||
|
StoragePool enablePrimaryStoragePool(Long id);
|
||||||
|
|
||||||
|
StoragePool disablePrimaryStoragePool(Long id);
|
||||||
|
|
||||||
StoragePool getStoragePool(long id);
|
StoragePool getStoragePool(long id);
|
||||||
|
|
||||||
boolean deleteImageStore(DeleteImageStoreCmd cmd);
|
boolean deleteImageStore(DeleteImageStoreCmd cmd);
|
||||||
|
|||||||
@ -26,4 +26,7 @@ public interface StorageStats {
|
|||||||
* @return bytes capacity of the storage server
|
* @return bytes capacity of the storage server
|
||||||
*/
|
*/
|
||||||
public long getCapacityBytes();
|
public long getCapacityBytes();
|
||||||
|
|
||||||
|
Long getCapacityIops();
|
||||||
|
Long getUsedIops();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -40,7 +40,7 @@ public interface Upload extends InternalIdentity, Identity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static enum Type {
|
public static enum Type {
|
||||||
VOLUME, TEMPLATE, ISO
|
VOLUME, SNAPSHOT, TEMPLATE, ISO
|
||||||
}
|
}
|
||||||
|
|
||||||
public static enum Mode {
|
public static enum Mode {
|
||||||
|
|||||||
@ -17,6 +17,7 @@
|
|||||||
package com.cloud.storage;
|
package com.cloud.storage;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.InternalIdentity;
|
import org.apache.cloudstack.api.InternalIdentity;
|
||||||
|
|
||||||
@ -25,6 +26,8 @@ public interface VMTemplateStorageResourceAssoc extends InternalIdentity {
|
|||||||
UNKNOWN, DOWNLOAD_ERROR, NOT_DOWNLOADED, DOWNLOAD_IN_PROGRESS, DOWNLOADED, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS, CREATING, CREATED, BYPASSED
|
UNKNOWN, DOWNLOAD_ERROR, NOT_DOWNLOADED, DOWNLOAD_IN_PROGRESS, DOWNLOADED, ABANDONED, UPLOADED, NOT_UPLOADED, UPLOAD_ERROR, UPLOAD_IN_PROGRESS, CREATING, CREATED, BYPASSED
|
||||||
}
|
}
|
||||||
|
|
||||||
|
List<Status> PENDING_DOWNLOAD_STATES = List.of(Status.NOT_DOWNLOADED, Status.DOWNLOAD_IN_PROGRESS);
|
||||||
|
|
||||||
String getInstallPath();
|
String getInstallPath();
|
||||||
|
|
||||||
long getTemplateId();
|
long getTemplateId();
|
||||||
|
|||||||
@ -30,6 +30,8 @@ import com.cloud.utils.fsm.StateObject;
|
|||||||
|
|
||||||
public interface Volume extends ControlledEntity, Identity, InternalIdentity, BasedOn, StateObject<Volume.State>, Displayable {
|
public interface Volume extends ControlledEntity, Identity, InternalIdentity, BasedOn, StateObject<Volume.State>, Displayable {
|
||||||
|
|
||||||
|
static final long DISK_OFFERING_SUITABILITY_CHECK_VOLUME_ID = -1;
|
||||||
|
|
||||||
// Managed storage volume parameters (specified in the compute/disk offering for PowerFlex)
|
// Managed storage volume parameters (specified in the compute/disk offering for PowerFlex)
|
||||||
String BANDWIDTH_LIMIT_IN_MBPS = "bandwidthLimitInMbps";
|
String BANDWIDTH_LIMIT_IN_MBPS = "bandwidthLimitInMbps";
|
||||||
String IOPS_LIMIT = "iopsLimit";
|
String IOPS_LIMIT = "iopsLimit";
|
||||||
@ -269,11 +271,13 @@ public interface Volume extends ControlledEntity, Identity, InternalIdentity, Ba
|
|||||||
|
|
||||||
void setExternalUuid(String externalUuid);
|
void setExternalUuid(String externalUuid);
|
||||||
|
|
||||||
public Long getPassphraseId();
|
Long getPassphraseId();
|
||||||
|
|
||||||
public void setPassphraseId(Long id);
|
void setPassphraseId(Long id);
|
||||||
|
|
||||||
public String getEncryptFormat();
|
String getEncryptFormat();
|
||||||
|
|
||||||
public void setEncryptFormat(String encryptFormat);
|
void setEncryptFormat(String encryptFormat);
|
||||||
|
|
||||||
|
boolean isDeleteProtection();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,7 +22,12 @@ import java.net.MalformedURLException;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.cloud.exception.ResourceAllocationException;
|
||||||
|
import com.cloud.offering.DiskOffering;
|
||||||
|
import com.cloud.user.Account;
|
||||||
import com.cloud.utils.Pair;
|
import com.cloud.utils.Pair;
|
||||||
|
import com.cloud.utils.fsm.NoTransitionException;
|
||||||
|
|
||||||
import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
|
import org.apache.cloudstack.api.command.user.volume.AssignVolumeCmd;
|
||||||
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
|
import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd;
|
||||||
import org.apache.cloudstack.api.command.user.volume.ChangeOfferingForVolumeCmd;
|
import org.apache.cloudstack.api.command.user.volume.ChangeOfferingForVolumeCmd;
|
||||||
@ -37,13 +42,9 @@ import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd;
|
|||||||
import org.apache.cloudstack.api.response.GetUploadParamsResponse;
|
import org.apache.cloudstack.api.response.GetUploadParamsResponse;
|
||||||
import org.apache.cloudstack.framework.config.ConfigKey;
|
import org.apache.cloudstack.framework.config.ConfigKey;
|
||||||
|
|
||||||
import com.cloud.exception.ResourceAllocationException;
|
|
||||||
import com.cloud.user.Account;
|
|
||||||
import com.cloud.utils.fsm.NoTransitionException;
|
|
||||||
|
|
||||||
public interface VolumeApiService {
|
public interface VolumeApiService {
|
||||||
|
|
||||||
ConfigKey<Long> ConcurrentMigrationsThresholdPerDatastore = new ConfigKey<Long>("Advanced"
|
ConfigKey<Long> ConcurrentMigrationsThresholdPerDatastore = new ConfigKey<>("Advanced"
|
||||||
, Long.class
|
, Long.class
|
||||||
, "concurrent.migrations.per.target.datastore"
|
, "concurrent.migrations.per.target.datastore"
|
||||||
, "0"
|
, "0"
|
||||||
@ -51,7 +52,7 @@ public interface VolumeApiService {
|
|||||||
, true // not sure if this is to be dynamic
|
, true // not sure if this is to be dynamic
|
||||||
, ConfigKey.Scope.Global);
|
, ConfigKey.Scope.Global);
|
||||||
|
|
||||||
ConfigKey<Boolean> UseHttpsToUpload = new ConfigKey<Boolean>("Advanced",
|
ConfigKey<Boolean> UseHttpsToUpload = new ConfigKey<>("Advanced",
|
||||||
Boolean.class,
|
Boolean.class,
|
||||||
"use.https.to.upload",
|
"use.https.to.upload",
|
||||||
"true",
|
"true",
|
||||||
@ -85,7 +86,7 @@ public interface VolumeApiService {
|
|||||||
* @param cmd
|
* @param cmd
|
||||||
* the API command wrapping the criteria
|
* the API command wrapping the criteria
|
||||||
* @return the volume object
|
* @return the volume object
|
||||||
* @throws ResourceAllocationException
|
* @throws ResourceAllocationException no capacity to allocate the new volume size
|
||||||
*/
|
*/
|
||||||
Volume resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationException;
|
Volume resizeVolume(ResizeVolumeCmd cmd) throws ResourceAllocationException;
|
||||||
|
|
||||||
@ -102,8 +103,12 @@ public interface VolumeApiService {
|
|||||||
|
|
||||||
boolean deleteVolume(long volumeId, Account caller);
|
boolean deleteVolume(long volumeId, Account caller);
|
||||||
|
|
||||||
|
Volume changeDiskOfferingForVolumeInternal(Long volumeId, Long newDiskOfferingId, Long newSize, Long newMinIops, Long newMaxIops, boolean autoMigrateVolume, boolean shrinkOk) throws ResourceAllocationException;
|
||||||
|
|
||||||
Volume attachVolumeToVM(AttachVolumeCmd command);
|
Volume attachVolumeToVM(AttachVolumeCmd command);
|
||||||
|
|
||||||
|
Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId, Boolean allowAttachForSharedFS);
|
||||||
|
|
||||||
Volume detachVolumeViaDestroyVM(long vmId, long volumeId);
|
Volume detachVolumeViaDestroyVM(long vmId, long volumeId);
|
||||||
|
|
||||||
Volume detachVolumeFromVM(DetachVolumeCmd cmd);
|
Volume detachVolumeFromVM(DetachVolumeCmd cmd);
|
||||||
@ -113,7 +118,9 @@ public interface VolumeApiService {
|
|||||||
|
|
||||||
Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType, List<Long> zoneIds) throws ResourceAllocationException;
|
Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType, List<Long> zoneIds) throws ResourceAllocationException;
|
||||||
|
|
||||||
Volume updateVolume(long volumeId, String path, String state, Long storageId, Boolean displayVolume, String customId, long owner, String chainInfo, String name);
|
Volume updateVolume(long volumeId, String path, String state, Long storageId,
|
||||||
|
Boolean displayVolume, Boolean deleteProtection,
|
||||||
|
String customId, long owner, String chainInfo, String name);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extracts the volume to a particular location.
|
* Extracts the volume to a particular location.
|
||||||
@ -163,6 +170,14 @@ public interface VolumeApiService {
|
|||||||
* </body>
|
* </body>
|
||||||
* </table>
|
* </table>
|
||||||
*/
|
*/
|
||||||
|
boolean doesStoragePoolSupportDiskOffering(StoragePool destPool, DiskOffering diskOffering);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the storage pool supports the required disk offering tags
|
||||||
|
* destPool the storage pool to check the disk offering tags
|
||||||
|
* diskOfferingTags the tags that should be supported
|
||||||
|
* return whether the tags are supported in the storage pool
|
||||||
|
*/
|
||||||
boolean doesStoragePoolSupportDiskOfferingTags(StoragePool destPool, String diskOfferingTags);
|
boolean doesStoragePoolSupportDiskOfferingTags(StoragePool destPool, String diskOfferingTags);
|
||||||
|
|
||||||
Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge);
|
Volume destroyVolume(long volumeId, Account caller, boolean expunge, boolean forceExpunge);
|
||||||
|
|||||||
@ -21,6 +21,7 @@ import java.util.List;
|
|||||||
import org.apache.cloudstack.api.command.user.snapshot.CopySnapshotCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.CopySnapshotCmd;
|
||||||
import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.CreateSnapshotPolicyCmd;
|
||||||
import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotPoliciesCmd;
|
||||||
|
import org.apache.cloudstack.api.command.user.snapshot.ExtractSnapshotCmd;
|
||||||
import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotPoliciesCmd;
|
||||||
import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.ListSnapshotsCmd;
|
||||||
import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
|
import org.apache.cloudstack.api.command.user.snapshot.UpdateSnapshotPolicyCmd;
|
||||||
@ -106,6 +107,16 @@ public interface SnapshotApiService {
|
|||||||
*/
|
*/
|
||||||
Snapshot createSnapshot(Long volumeId, Long policyId, Long snapshotId, Account snapshotOwner);
|
Snapshot createSnapshot(Long volumeId, Long policyId, Long snapshotId, Account snapshotOwner);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Extracts the snapshot to a particular location.
|
||||||
|
*
|
||||||
|
* @param cmd
|
||||||
|
* the command specifying url (where the snapshot needs to be extracted to), zoneId (zone where the snapshot exists) and
|
||||||
|
* id (the id of the snapshot)
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
String extractSnapshot(ExtractSnapshotCmd cmd);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Archives a snapshot from primary storage to secondary storage.
|
* Archives a snapshot from primary storage to secondary storage.
|
||||||
* @param id Snapshot ID
|
* @param id Snapshot ID
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package com.cloud.template;
|
|||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.cloud.cpu.CPU;
|
||||||
import com.cloud.user.UserData;
|
import com.cloud.user.UserData;
|
||||||
import org.apache.cloudstack.acl.ControlledEntity;
|
import org.apache.cloudstack.acl.ControlledEntity;
|
||||||
import org.apache.cloudstack.api.Identity;
|
import org.apache.cloudstack.api.Identity;
|
||||||
@ -148,4 +149,6 @@ public interface VirtualMachineTemplate extends ControlledEntity, Identity, Inte
|
|||||||
|
|
||||||
UserData.UserDataOverridePolicy getUserDataOverridePolicy();
|
UserData.UserDataOverridePolicy getUserDataOverridePolicy();
|
||||||
|
|
||||||
|
CPU.CPUArch getArch();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -94,4 +94,8 @@ public interface Account extends ControlledEntity, InternalIdentity, Identity {
|
|||||||
|
|
||||||
boolean isDefault();
|
boolean isDefault();
|
||||||
|
|
||||||
|
public void setApiKeyAccess(Boolean apiKeyAccess);
|
||||||
|
|
||||||
|
public Boolean getApiKeyAccess();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -19,6 +19,7 @@ package com.cloud.user;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.cloud.utils.Pair;
|
||||||
import org.apache.cloudstack.acl.ControlledEntity;
|
import org.apache.cloudstack.acl.ControlledEntity;
|
||||||
import org.apache.cloudstack.acl.RoleType;
|
import org.apache.cloudstack.acl.RoleType;
|
||||||
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
|
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
|
||||||
@ -86,6 +87,8 @@ public interface AccountService {
|
|||||||
|
|
||||||
boolean isDomainAdmin(Long accountId);
|
boolean isDomainAdmin(Long accountId);
|
||||||
|
|
||||||
|
boolean isResourceDomainAdmin(Long accountId);
|
||||||
|
|
||||||
boolean isNormalUser(long accountId);
|
boolean isNormalUser(long accountId);
|
||||||
|
|
||||||
User getActiveUserByRegistrationToken(String registrationToken);
|
User getActiveUserByRegistrationToken(String registrationToken);
|
||||||
@ -127,9 +130,9 @@ public interface AccountService {
|
|||||||
*/
|
*/
|
||||||
UserAccount getUserAccountById(Long userId);
|
UserAccount getUserAccountById(Long userId);
|
||||||
|
|
||||||
public Map<String, String> getKeys(GetUserKeysCmd cmd);
|
public Pair<Boolean, Map<String, String>> getKeys(GetUserKeysCmd cmd);
|
||||||
|
|
||||||
public Map<String, String> getKeys(Long userId);
|
public Pair<Boolean, Map<String, String>> getKeys(Long userId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Lists user two-factor authentication provider plugins
|
* Lists user two-factor authentication provider plugins
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user