update, add kvm interface

Author: lowang-bh

README.md

@@ -28,18 +28,28 @@
         start the log server in case of no permission to the directory /var/log
 
         sudo nohup python ~/dev_virt/lib/Log/logging_server.py &
+## Xenserver API Architecture
+ ![highlevel](XenserverApi-Architecture.png)
 
 ## Some phrase:
 - PIF: physical interface, the eth on server
 - VIF: virtual  interface, the eth on VM
 - SR:  storage repository, the storage pool on server
 
+# Create KVM VMS
+  1. Auto schedual the target vm to a available server, this is only available on dev env
+
+  > lain3_node.py --role=rolename --cluster=<test|xyz|kvm>
+
+  2. manually given the target vm-name, host and vm-ip. Product env should use this command
+
+  > lain3_node.py --role=rolename --name=new_vm_name --host=hostip --ip=vm_ip
 # Create multiple VMs from xml config
 - `setup_vms.py --validate xmlFile`     Validate the given xml file
 - `setup_vms.py --create   xmlFile`     Do the create up according to the xml file
 
 Create VMs with xml just need to write a xml config following the xml-example. Before really creating VMs, please run
-*setup_system.py --validate* to check your xml.
+*setup_vms.py --validate* to check your xml.
 
 ```xml
 <servers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="">
@@ -64,8 +74,13 @@ Create VMs with xml just need to write a xml config following the xml-example. B
 
   <!--here you can add another server -->
   <SERVER serverIp="192.168.1.15" user="root" passwd="xxxxxx">
+      <!--VM element: vmname, template is required, others are options -->
         <VM vmname="createViaXml2" cpucores="1" cpumax="2" minMemory="1" memory="2" maxMemory="3" template="NewTemplate">
+            <!--IP element: vifIndex and ip is required, device/network/bridge is options, if no device/network/bridge, will choose manage network as default -->
             <IP vifIndex="0" ip="192.168.1.241" device="eth1" />
+            <IP vifIndex="1" ip="192.168.1.241" network="xenbr1" />
+            <IP vifIndex="2" ip="192.168.1.242" bridge="xenbr1" />
+            <!--DISK element: size is required, storage is options, is no storage, it will choose the storage which has largest free size -->
             <DISK size="2" />
         </VM>
   </SERVER>
@@ -107,10 +122,11 @@ Create VMs with xml just need to write a xml config following the xml-example. B
     **neither *--device* nor *--network*, the default manage network will be used**
     > create_vm.py -c "test2" -t "CentOS 7.2 template" --ip=192.168.1.100 --vif=0
 
-#####  3). <b>**Create a new VM with given max cpu cores:**<b>
+#####  3). <b>**Create a new VM with given max cpu cores and current cpu cores:**<b>
   - `--cpu-max=MAX_CORES`   Config the max VCPU cores.
+  - `--cpu-cores=CPU_CORES` Config the number of startup VCPUs for the new created VM
 
-    > create_vm.py -c "test2" -t "CentOS 7.2 template" --cpu-max=2
+    > create_vm.py -c "test2" -t "CentOS 7.2 template" --cpu-core=2 --cpu-max=4
 
     The max cpu cores can be configured when VM is power off only, and it affect the upper limit when set the cpu cores lively
 
@@ -136,6 +152,11 @@ Create VMs with xml just need to write a xml config following the xml-example. B
     **if no *--storage*, will use the storage which has a largest free volume**
     > create_vm.py "test1"--add-disk=2
 
+## 3. delete_vm.py
+  To delete a vm, please use *delete_vm.py --vm=vm_to_delete*, this will ask user to input 'yes' or 'no' to confirm
+  - `delete_vm.py  --vm=vm_name [--host=ip --user=user --pwd=passwd]`
+  
+  if `--force` is set, then the additional disk on vm will also be deleted, this feature is only support on kvm now.
 
 ## 4. config_vm.py
 #### The IP and memory configuration is same as that in create VM.
@@ -154,7 +175,7 @@ Create VMs with xml just need to write a xml config following the xml-example. B
     > config_vm.py "test1"  --add-vif=1 --device=eth1 --ip=192.168.1.200 --netmask=255.255.255.0
 
 ##### 2). <b>**config a VM' cpu when it is running**<b>
-  - `--cpu-cores=CPU_CORES` Config the VCPU cores lively
+  - `--cpu-cores=CPU_CORES` Config the VCPU cores lively for a running VM or the number of startup VCPUs for a halted VM
 
       > config_vm.py "test1" --cpu-core=4
 

XenserverApi-Architecture.png

@@ -73,7 +73,7 @@ def respond_data(self):
                 return json.loads(self.resp).get('data', {})
             elif isinstance(self.resp, dict):
                 return self.resp.get('data', {})
-        except ValueError, error:
+        except ValueError as error:
             log.exception(error)
 
         return {}

app/cmdb/host_driver.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python
 # -*- coding:UTF-8 -*-
 
-import requests
 import json
-from lib.Log.log import log
+
+import requests
+
 from app.cmdb.host_driver import HostDbDriver
 from app.cmdb.settings import HOSTs_URL
+from lib.Log.log import log
 
 
 class HostDriver(HostDbDriver):
@@ -91,7 +93,7 @@ def update(self, id=None, sn=None, hostname=None, data=None, json_data=None):
         if data:
             if not isinstance(data, dict):
                 log.error("Data should be a dict.")
-                return  False
+                return False
         elif json_data:
             if not isinstance(json_data, dict):
                 log.error("Json data should be a dict")
@@ -111,12 +113,13 @@ def update(self, id=None, sn=None, hostname=None, data=None, json_data=None):
         if data:
             data['modified'] = str(modified)
             log.debug("Patch url:%s, data: %s", url, data.get('comment', data))
-            self.resp = self.session.patch(url, data=data) # When dict value is None, pass in data will not set db null
+            self.resp = self.session.patch(url, data=data)  # When dict value is None, pass in data will not set db null
         elif json_data:
             json_data['modified'] = str(modified)
             json_data = json.dumps(json_data)
             log.debug("Patch url:%s, json data: %s", url, json_data)
-            self.resp = self.session.patch(url, json=json_data) # when dict value is none, json value is null, set db null
+            # when dict value is none, json value is null, pass in json=null will set db null
+            self.resp = self.session.patch(url, json=json_data)
 
         if self.resp.status_code == requests.codes.ok:
             log.info("Update to database successfully.")
@@ -163,7 +166,7 @@ def query(self, id=None, sn=None, hostname=None):
             log.debug(self.resp.content)
 
         if not self.respond_data_count:
-            log.warn("No records found with query data: %s.", data)
+            log.debug("No records found with query data: %s.", data)
             return []
         else:
             return self.respond_data_list

app/cmdb/hosts.py

@@ -0,0 +1,34 @@
+{
+    "master": {
+        "cpu": 8,
+        "memory": 16,
+        "template": "k8s-template"
+    },
+    "ingress": {
+        "cpu": 8,
+        "memory": 16,
+        "template": "k8s-template"
+    },
+    "node": {
+        "cpu": 16,
+        "memory": 48,
+        "template": "k8s-template"
+    },
+    "etcd": {
+        "cpu": 4,
+        "memory": 8,
+        "template": "k8s-template"
+    },
+    "jenkins": {
+        "cpu": 8,
+        "memory": 32,
+        "template": "template",
+        "disk_size": 100,
+        "add_disk_num": 2
+    },
+    "normal": {
+       "cpu": 4,
+       "memory": 8,
+       "template": "nfs-template"
+    }
+}

etc/lain3Nodeconfig.json

@@ -0,0 +1,23 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+ File Name: constans.py
+ Author: longhui
+ Created Time: 2019-04-24 11:07:34
+ Description: lain3 node for k8s cluster default config
+"""
+template_dict = {
+
+    "master": {"cpu": 8, "memory": 16, "template": "k8s-template"},
+    "ingress": {"cpu": 8, "memory": 16, "template": "k8s-template"},
+    "node": {"cpu": 16, "memory": 32, "template": "k8s-template", "disk_size": 200, "add_disk_num": 1},
+    "etcd": {"cpu": 4, "memory": 8, "template": "k8s-template", "disk_size": 100, "add_disk_num": 1},
+    "jenkins": {"cpu": 8, "memory": 32, "template": "template", "disk_size": 100, "add_disk_num": 2},
+    }
+
+DISK_POOL = "kvm-disk-pool"
+NETFS_POOL_TYPE="netfs"
+DEFAULT_NETWORK = "libvirtmgr-net"
+MEMORY_OVERCOMMIT_FRACTION = 1.2
+Libvirtd_User = "admin"
+Libvirtd_Pass = "admin"

initial_env.sh

@@ -6,6 +6,7 @@
  Created Time: 2018-03-06 10:43:55
 '''
 from ipaddress import ip_address, ip_network, AddressValueError, NetmaskValueError
+
 from lib.Log.log import log
 
 
@@ -40,12 +41,16 @@ def _ipv4_address_check(cls, ipv4_address, prop_string):
         return True
 
     @classmethod
-    def is_valid_ipv4_parameter(cls, dest_ip, netmask, gateway=None):
-        '''
-        check the validation of the DCN related parameters.
+    def is_valid_ipv4_parameter(cls, dest_ip, bridge_ip, netmask, gateway=None):
+        """
+        check the dest ip belong to the same hosts generated by bridge ip and netmask.
         For the ipaddress APIs, please refer to https://docs.python.org/3/library/ipaddress.html
-        original: isValidDcnIpParameters
-        '''
+        :param dest_ip: target ip
+        :param bridge_ip:  host ip
+        :param netmask:  netmask
+        :param gateway: 
+        :return: true or false
+        """
 
         # check the validation of the IP address
         try:
@@ -58,11 +63,15 @@ def is_valid_ipv4_parameter(cls, dest_ip, netmask, gateway=None):
 
         # check the validation of the netmask
         try:
-            ip_address_netmask = ip_network(unicode(dest_ip + "/" + netmask), strict=False)
+            ip_address_netmask = ip_network(unicode(bridge_ip + "/" + netmask), strict=False)
         except (AddressValueError, NetmaskValueError, ValueError) as error:
             log.exception("Invalid IPv4 netmask %s: %s", netmask, str(error))
             return False
 
+        if ip_addr not in ip_address_netmask.hosts():
+            log.error("The dest ip [%s] not belong to the target network: %s", dest_ip, ip_address_netmask)
+            return False
+
         if gateway is None:
             return True
 
@@ -101,13 +110,15 @@ def is_IP_pingable(ip_address):
 
 
 if __name__ == "__main__":
-    ip_addr_network = "92.0.2.0"
+    ip_addr_network = "92.0.2.1"
     gateway = "92.0.2.1"
     dest_ip = "92.0.2.0"
     netmask = "255.255.255.0"
-    print IpCheck.is_valid_ipv4_dcn_parameter(ip_addr_network, netmask, gateway)
-    print IpCheck.is_valid_ipv4_dcn_parameter(dest_ip, netmask, gateway=None)
-    #import pyping
-    #pyping.ping(hostname, timeout, count, packet_size)
-    print is_IP_pingable(gateway)
-    print is_IP_pingable("localhost")
+    print IpCheck.is_valid_ipv4_parameter(ip_addr_network, "92.0.2.3", netmask, gateway)
+    print IpCheck.is_valid_ipv4_parameter(dest_ip, "92.0.3.3", netmask, gateway=None)
+    # import pyping
+    # pyping.ping(hostname, timeout, count, packet_size)
+    ip_address_netmask = ip_network(unicode("192.168.1.3" + "/" + "24"), strict=False)
+    print(ip_address_netmask, type(ip_address_netmask), str(ip_address_netmask))
+    for ip in ip_address_netmask.hosts():
+        print(ip, type(ip), str(ip))