Skip to content

Commit 4d3faa3

Browse files
author
gitlab
committed
Merge branch 'feature-external-service-configuration@@2' into '5.5.12'
<feature>[core]: support configure external service See merge request zstackio/zstack!9300
2 parents d2020c5 + 16db51f commit 4d3faa3

43 files changed

Lines changed: 1993 additions & 9 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

conf/db/upgrade/V5.5.12__schema.sql

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,14 @@ WHERE `opaque` IS NOT NULL
3333
AND `endTime` IS NULL
3434
AND Json_getKeyValue(`opaque`, 'end_time') IS NOT NULL
3535
AND Json_getKeyValue(`opaque`, 'end_time') != '';
36+
37+
-- Add ExternalServiceConfiguration table
38+
CREATE TABLE IF NOT EXISTS `zstack`.`ExternalServiceConfigurationVO` (
39+
`uuid` varchar(32) NOT NULL UNIQUE,
40+
`serviceType` varchar(32) NOT NULL,
41+
`configuration` text DEFAULT NULL,
42+
`description` varchar(2048) DEFAULT NULL,
43+
`lastOpDate` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
44+
`createDate` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
45+
PRIMARY KEY (`uuid`)
46+
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

conf/persistence.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,5 +223,6 @@
223223
<class>org.zstack.header.network.l3.L3NetworkSequenceNumberVO</class>
224224
<class>org.zstack.network.hostNetworkInterface.PhysicalSwitchVO</class>
225225
<class>org.zstack.network.hostNetworkInterface.PhysicalSwitchPortVO</class>
226+
<class>org.zstack.header.core.external.service.ExternalServiceConfigurationVO</class>
226227
</persistence-unit>
227228
</persistence>

conf/serviceConfig/externalService.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,21 @@
99
<message>
1010
<name>org.zstack.header.core.external.service.APIReloadExternalServiceMsg</name>
1111
</message>
12+
13+
<message>
14+
<name>org.zstack.header.core.external.service.APIAddExternalServiceConfigurationMsg</name>
15+
</message>
16+
17+
<message>
18+
<name>org.zstack.header.core.external.service.APIQueryExternalServiceConfigurationMsg</name>
19+
<serviceId>query</serviceId>
20+
</message>
21+
22+
<message>
23+
<name>org.zstack.header.core.external.service.APIUpdateExternalServiceConfigurationMsg</name>
24+
</message>
25+
26+
<message>
27+
<name>org.zstack.header.core.external.service.APIDeleteExternalServiceConfigurationMsg</name>
28+
</message>
1229
</service>

core/src/main/java/org/zstack/core/externalservice/ExternalService.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,10 @@ public interface ExternalService {
1616
ExternalServiceCapabilities getExternalServiceCapabilities();
1717

1818
void reload();
19+
20+
String getServiceType();
21+
22+
default void externalConfig(String serviceType) {
23+
// no-op by default
24+
};
1925
}

0 commit comments

Comments
 (0)