Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
95ae676
Merge pull request #1 from Dajeong-Park/ablestack-bronto
jschoiRR Jul 26, 2021
1195377
CONTROLLER 관련 변수 추가
jschoiRR Jul 29, 2021
f85eef2
setter 메소드 추가
jschoiRR Jul 29, 2021
0a6f299
컨트롤러 관련 변수 추가
jschoiRR Jul 29, 2021
12d2e67
addDesktopControllerVersion api 메소드 관련 소스 반영
jschoiRR Jul 29, 2021
dc6e4a1
message.success.register.contoller.template.version 값 추가
jschoiRR Jul 29, 2021
a378a4b
controller 메뉴 관련 항목명 수정
jschoiRR Jul 29, 2021
71b8c26
setter 메소드 추가
jschoiRR Jul 29, 2021
457c098
소스 정리
jschoiRR Jul 29, 2021
16f24e4
이벤트 타입 string값 32 글자 이내로 변경
jschoiRR Jul 29, 2021
b094370
deleteDesktopContollerVersion api 관련 메소드 생성
jschoiRR Jul 29, 2021
a6e2721
deleteDesktopControllerVersion api 추가
jschoiRR Jul 29, 2021
1f457db
컨트롤러 템플릿 삭제, 업데이트 메시지 추가
jschoiRR Jul 30, 2021
1c212f8
데스크톱 컨트롤러 템플릿 상태값 변경 API 관련 소스 반영
jschoiRR Jul 30, 2021
35d7c5a
파라미터 항목 설명 문구 수정
jschoiRR Jul 30, 2021
acafb4a
폴더 변경
jschoiRR Jul 30, 2021
d78d728
파일 폴더 변경
jschoiRR Jul 30, 2021
a3be897
ApiConstants Desktop 관련 변수 수정
jschoiRR Jul 30, 2021
61c9610
DESKTOP 관련 변수 변경
jschoiRR Jul 30, 2021
c2fa50a
변수값 변경
jschoiRR Jul 30, 2021
beb6a53
Merge branch 'ablestack-bronto' into addDesktopControllerVersion
jschoiRR Jul 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public Long getZoneId() {
return zoneId;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,14 +179,26 @@ public String getDisplayText() {
return displayText;
}

public void setDisplayText(String displayText) {
this.displayText = displayText;
}

public String getFormat() {
return format;
}

public void setFormat(String format) {
this.format = format;
}

public String getHypervisor() {
return hypervisor;
}

public void setHypervisor(String hypervisor) {
this.hypervisor = hypervisor;
}

public Boolean isFeatured() {
return featured;
}
Expand All @@ -195,14 +207,26 @@ public Boolean isPublic() {
return publicTemplate;
}

public void setPublic(Boolean publicTemplate) {
this.publicTemplate = publicTemplate;
}

public String getTemplateName() {
return templateName;
}

public void setTemplateName(String templateName) {
this.templateName = templateName;
}

public Long getOsTypeId() {
return osTypeId;
}

public void setOsTypeId(Long osTypeId) {
this.osTypeId = osTypeId;
}

public Boolean isPasswordEnabled() {
return passwordEnabled;
}
Expand All @@ -223,6 +247,10 @@ public String getUrl() {
return url;
}

public void setUrl(String url) {
this.url = url;
}

public List<Long> getZoneIds() {
// This function will return null when the zoneId
//is -1 which means all zones.
Expand All @@ -245,10 +273,18 @@ public Long getDomainId() {
return domainId;
}

public void setDomainId(Long domainId) {
this.domainId = domainId;
}

public String getAccountName() {
return accountName;
}

public void setAccountName(String accountName) {
this.accountName = accountName;
}

public String getChecksum() {
return checksum;
}
Expand All @@ -257,6 +293,14 @@ public String getTemplateTag() {
return templateTag;
}

public Long getZoneId() {
return zoneId;
}

public void setZoneId(Long zoneId) {
this.zoneId = zoneId;
}

public Map getDetails() {
if (details == null || details.isEmpty()) {
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public DesktopControllerVersionVO() {
this.uuid = UUID.randomUUID().toString();
}

public DesktopControllerVersionVO(String name, String version, String description, long templateId, Long zoneId) {
public DesktopControllerVersionVO(String name, String version, String description, Long zoneId) {
this.uuid = UUID.randomUUID().toString();
this.name = name;
this.description = description;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@
@Table(name = "desktop_template_map")
public class DesktopTemplateMapVO implements DesktopTemplateMap {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
long id;

@Column(name = "version_id")
long versionId;

@Column(name = "template_id")
long templateId;

@Override
public long getId() {
return id;
Expand All @@ -36,11 +47,9 @@ public long getId() {
@Override
public long getVersionId() {
return versionId;

}

public void setVersionId(long versionId) {

this.versionId = versionId;
}

Expand All @@ -50,23 +59,10 @@ public long getTemplateId() {
}

public void setTemplateId(long templateId) {

this.templateId = templateId;
}

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "id")
long id;

@Column(name = "version_id")
long versionId;

@Column(name = "template_id")
long templateId;

public DesktopTemplateMapVO() {

}

public DesktopTemplateMapVO(long versionId, long templateId) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,7 @@
package com.cloud.desktop.version;

public class DesktopVersionEventTypes {
public static final String EVENT_DESKTOP_CONTROLLER_VERSION_ADD = "DESKTOP.CONTROL.VERSION.ADD";
public static final String EVENT_DESKTOP_CONTROLLER_VERSION_DELETE = "DESKTOP.CONTROL.VERSION.DELETE";
public static final String EVENT_DESKTOP_CONTROLLER_VERSION_UPDATE = "DESKTOP.CONTROL.VERSION.UPDATE";
}
Loading