Draft: <feature>[physicalServer]: SUG-1461 add assignment foundation

build/pom.xml

@@ -631,6 +631,11 @@
                     <artifactId>hostNetworkInterface</artifactId>
                     <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                    <groupId>org.zstack</groupId>
+                    <artifactId>physicalServer</artifactId>
+                    <version>${project.version}</version>
+                </dependency>
                 <dependency>
                     <groupId>org.zstack</groupId>
                     <artifactId>ovn</artifactId>
@@ -977,6 +982,11 @@
             <artifactId>hostNetworkInterface</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.zstack</groupId>
+            <artifactId>physicalServer</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.zstack</groupId>
             <artifactId>observabilityServer</artifactId>

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

@@ -0,0 +1,88 @@
+CREATE TABLE IF NOT EXISTS `zstack`.`PhysicalServerVO` (
+    `uuid` varchar(32) NOT NULL,
+    `zoneUuid` varchar(32) DEFAULT NULL,
+    `poolUuid` varchar(32) DEFAULT NULL,
+    `serialNumber` varchar(255) NOT NULL,
+    `createDate` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00',
+    `lastOpDate` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`uuid`),
+    UNIQUE KEY `ukPhysicalServerSerialNumber` (`serialNumber`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `zstack`.`PhysicalServerResourceAssignmentVO` (
+    `uuid` varchar(32) NOT NULL,
+    `serverUuid` varchar(32) NOT NULL,
+    `resourceType` varchar(32) NOT NULL,
+    `assignmentType` varchar(64) NOT NULL,
+    `spec` text NOT NULL,
+    `specGeneration` bigint NOT NULL DEFAULT 1,
+    `status` text DEFAULT NULL,
+    `observedGeneration` bigint DEFAULT NULL,
+    `observedAt` timestamp NULL DEFAULT NULL,
+    `createDate` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00',
+    `lastOpDate` timestamp NOT NULL DEFAULT '2000-01-01 00:00:00' ON UPDATE CURRENT_TIMESTAMP,
+    PRIMARY KEY (`uuid`),
+    UNIQUE KEY `ukPhysicalServerResourceAssignment` (`serverUuid`, `resourceType`, `assignmentType`),
+    CONSTRAINT `fkPhysicalServerResourceAssignmentServerUuid`
+        FOREIGN KEY (`serverUuid`) REFERENCES `zstack`.`PhysicalServerVO` (`uuid`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+CALL ADD_COLUMN('HostEO', 'serverUuid', 'VARCHAR(32)', 1, NULL);
+CALL ADD_COLUMN('ManagementNodeVO', 'serverUuid', 'VARCHAR(32)', 1, NULL);
+
+UPDATE `zstack`.`HostEO`
+SET `serverUuid` = NULL
+WHERE `deleted` IS NOT NULL AND `serverUuid` IS NOT NULL;
+
+DROP PROCEDURE IF EXISTS addPhysicalServerIdentityUniqueKeys;
+DELIMITER $$
+CREATE PROCEDURE addPhysicalServerIdentityUniqueKeys()
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.statistics
+        WHERE table_schema = 'zstack'
+          AND table_name = 'HostEO'
+          AND index_name = 'ukHostEOServerUuid'
+    ) THEN
+        ALTER TABLE `zstack`.`HostEO`
+            ADD UNIQUE KEY `ukHostEOServerUuid` (`serverUuid`);
+    END IF;
+
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.statistics
+        WHERE table_schema = 'zstack'
+          AND table_name = 'ManagementNodeVO'
+          AND index_name = 'ukManagementNodeVOServerUuid'
+    ) THEN
+        ALTER TABLE `zstack`.`ManagementNodeVO`
+            ADD UNIQUE KEY `ukManagementNodeVOServerUuid` (`serverUuid`);
+    END IF;
+END $$
+DELIMITER ;
+CALL addPhysicalServerIdentityUniqueKeys();
+DROP PROCEDURE IF EXISTS addPhysicalServerIdentityUniqueKeys;
+
+CALL ADD_CONSTRAINT(
+    'HostEO',
+    'fkHostEOServerUuid',
+    'serverUuid',
+    'PhysicalServerVO',
+    'uuid',
+    'SET NULL'
+);
+
+DROP VIEW IF EXISTS `zstack`.`HostVO`;
+CREATE VIEW `zstack`.`HostVO` AS
+    SELECT uuid, zoneUuid, clusterUuid, name, description, managementIp, hypervisorType,
+           state, status, createDate, lastOpDate, architecture, serverUuid
+    FROM `zstack`.`HostEO`
+    WHERE deleted IS NULL;
+
+CALL ADD_CONSTRAINT(
+    'ManagementNodeVO',
+    'fkManagementNodeVOServerUuid',
+    'serverUuid',
+    'PhysicalServerVO',
+    'uuid',
+    'SET NULL'
+);

conf/persistence.xml

@@ -229,5 +229,7 @@
         <class>org.zstack.network.hostNetworkInterface.PhysicalSwitchVO</class>
         <class>org.zstack.network.hostNetworkInterface.PhysicalSwitchPortVO</class>
         <class>org.zstack.header.core.external.service.ExternalServiceConfigurationVO</class>
+        <class>org.zstack.physicalserver.PhysicalServerVO</class>
+        <class>org.zstack.physicalserver.PhysicalServerResourceAssignmentVO</class>
     </persistence-unit>
 </persistence>

conf/serviceConfig/physicalServer.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<service xmlns="http://zstack.org/schema/zstack">
+    <id>physicalServer</id>
+    <interceptor>PhysicalServerApiInterceptor</interceptor>
+
+    <message>
+        <name>org.zstack.physicalserver.APIQueryPhysicalServerMsg</name>
+        <serviceId>query</serviceId>
+    </message>
+
+    <message>
+        <name>org.zstack.physicalserver.APIQueryPhysicalServerResourceAssignmentMsg</name>
+        <serviceId>query</serviceId>
+    </message>
+
+    <message>
+        <name>org.zstack.physicalserver.APIUpdatePhysicalServerCpuAssignmentMsg</name>
+    </message>
+
+    <message>
+        <name>org.zstack.physicalserver.APIRefreshPhysicalServerCpuIsolationMsg</name>
+    </message>
+</service>

conf/springConfigXml/HostManager.xml

@@ -74,4 +74,4 @@
         </zstack:plugin>
     </bean>
 
-</beans>
+</beans>

conf/springConfigXml/Kvm.xml

@@ -115,6 +115,24 @@
         </zstack:plugin>
     </bean>
 
+    <bean id="KvmPhysicalServerAdapter" class="org.zstack.kvm.KvmPhysicalServerAdapter">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.header.Component" />
+            <zstack:extension interface="org.zstack.compute.host.PostHostConnectExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.host.HostAfterConnectedExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.host.HostDeleteExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.managementnode.ManagementNodeReadyExtensionPoint" />
+            <zstack:extension interface="org.zstack.header.physicalserver.PhysicalServerCpuConsumerAdapter" />
+        </zstack:plugin>
+    </bean>
+
+    <bean id="KvmPhysicalServerCpuCascadeExtension"
+          class="org.zstack.kvm.KvmPhysicalServerCpuCascadeExtension">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.core.cascade.CascadeExtensionPoint" />
+        </zstack:plugin>
+    </bean>
+
     <bean id="KVMApiInterceptor" class="org.zstack.kvm.KVMApiInterceptor">
         <zstack:plugin>
             <zstack:extension interface="org.zstack.header.apimediator.ApiMessageInterceptor"/>

conf/springConfigXml/ManagementNodeManager.xml

@@ -17,4 +17,18 @@
 			<zstack:extension interface="org.zstack.header.vo.FindSameNodeExtensionPoint"/>
 		</zstack:plugin>
 	</bean>
+
+	<bean id="LocalCpuTopologyCollector" class="org.zstack.core.cpu.LocalCpuTopologyCollector" />
+	<bean id="LocalSharedCpuSetExecutor" class="org.zstack.core.cpu.LocalSharedCpuSetExecutor" />
+
+	<bean id="ManagementNodePhysicalServerAdapter"
+		  class="org.zstack.portal.managementnode.ManagementNodePhysicalServerAdapter">
+		<zstack:plugin>
+			<zstack:extension interface="org.zstack.header.Component" />
+			<zstack:extension interface="org.zstack.header.Service" />
+			<zstack:extension interface="org.zstack.header.managementnode.ManagementNodeChangeListener" />
+			<zstack:extension interface="org.zstack.header.managementnode.ManagementNodeReadyExtensionPoint" />
+			<zstack:extension interface="org.zstack.header.physicalserver.PhysicalServerCpuConsumerAdapter" />
+		</zstack:plugin>
+	</bean>
 </beans>

conf/springConfigXml/physicalServer.xml

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:zstack="http://zstack.org/schema/zstack"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+       http://zstack.org/schema/zstack
+       http://zstack.org/schema/zstack/plugin.xsd"
+       default-init-method="init" default-destroy-method="destroy">
+
+    <bean id="PhysicalServerAssignmentRepository"
+          class="org.zstack.physicalserver.PhysicalServerAssignmentRepository"/>
+
+    <bean id="PhysicalServerIdentityService"
+          class="org.zstack.physicalserver.PhysicalServerIdentityService"/>
+
+    <bean id="PhysicalServerCpuPlanner"
+          class="org.zstack.physicalserver.PhysicalServerCpuPlanner"/>
+
+    <bean id="PhysicalServerCpuAssignmentHandler"
+          class="org.zstack.physicalserver.PhysicalServerCpuAssignmentHandler">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.physicalserver.PhysicalServerResourceAssignmentHandler"/>
+        </zstack:plugin>
+    </bean>
+
+    <bean id="PhysicalServerCpuReconciler"
+          class="org.zstack.physicalserver.PhysicalServerCpuReconciler"/>
+
+    <bean id="PhysicalServerSharedCpuReconciler"
+          class="org.zstack.physicalserver.PhysicalServerSharedCpuReconciler"/>
+
+    <bean id="FakeZbsCpuIsolationProvider"
+          class="org.zstack.physicalserver.FakeZbsCpuIsolationProvider">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.physicalserver.ZbsCpuIsolationProvider"/>
+        </zstack:plugin>
+    </bean>
+
+    <bean id="PhysicalServerManager" class="org.zstack.physicalserver.PhysicalServerManagerImpl">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.header.Component"/>
+            <zstack:extension interface="org.zstack.header.Service"/>
+            <zstack:extension interface="org.zstack.header.managementnode.ManagementNodeReadyExtensionPoint"/>
+            <zstack:extension interface="org.zstack.header.physicalserver.PhysicalServerManager"/>
+        </zstack:plugin>
+    </bean>
+
+    <bean id="PhysicalServerApiInterceptor"
+          class="org.zstack.physicalserver.PhysicalServerApiInterceptor">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.header.apimediator.ApiMessageInterceptor"/>
+        </zstack:plugin>
+    </bean>
+</beans>

conf/springConfigXml/zbs.xml

@@ -29,4 +29,18 @@
             <zstack:extension interface="org.zstack.header.Component" />
         </zstack:plugin>
     </bean>
+
+    <bean id="ZbsNodeRefContributor" class="org.zstack.storage.zbs.ZbsNodeRefContributorImpl">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.physicalserver.ZbsNodeRefContributor" />
+        </zstack:plugin>
+    </bean>
+
+    <bean id="ZbsCpuIsolationCascadeExtension"
+          class="org.zstack.storage.zbs.ZbsCpuIsolationCascadeExtension">
+        <zstack:plugin>
+            <zstack:extension interface="org.zstack.header.Component" />
+            <zstack:extension interface="org.zstack.core.cascade.CascadeExtensionPoint" />
+        </zstack:plugin>
+    </bean>
 </beans>

conf/zstack.xml

@@ -46,6 +46,7 @@
     <import resource="springConfigXml/iscsi.xml"/>
     <import resource="springConfigXml/expon.xml"/>
     <import resource="springConfigXml/zbs.xml"/>
+    <import resource="springConfigXml/physicalServer.xml"/>
     <import resource="springConfigXml/cbd.xml"/>
     <import resource="springConfigXml/xinfini.xml"/>
     <import resource="springConfigXml/ExternalPrimaryStorage.xml"/>

core/src/main/java/org/zstack/core/Platform.java

@@ -120,8 +120,10 @@ public class Platform {
     };
     private static final List<String> UNUSABLE_MACHINE_IDENTITIES = Arrays.asList(
             "none",
+            "n/a",
             "unknown",
             "not specified",
+            "to be filled",
             "to be filled by o.e.m.",
             "to be filled by oem",
             "default string",
@@ -896,6 +898,18 @@ private static String getManagementServerFingerprint() {
         return MANAGEMENT_SERVER_FINGERPRINT_ALGORITHM + DigestUtils.sha256Hex(StringUtils.join(identities, "\n"));
     }
 
+    public static String getManagementServerSerialNumber() {
+        String serialNumber = normalizeMachineSerialNumber(
+                readMachineIdentity("/sys/class/dmi/id/product_serial"));
+        return serialNumber == null
+                ? normalizeMachineSerialNumber(readDmiMachineIdentity("system-serial-number"))
+                : serialNumber;
+    }
+
+    public static String normalizeMachineSerialNumber(String serialNumber) {
+        return normalizeMachineIdentity(serialNumber);
+    }
+
     private static String readMachineIdentity(String path) {
         File file = new File(path);
         if (!file.isFile() || !file.canRead()) {