Selaa lähdekoodia

修正novnc目标主机地址bug

James Iter 8 vuotta sitten
vanhempi
sitoutus
cb1a3dcbe0
3 muutettua tiedostoa jossa 10 lisäystä ja 2 poistoa
  1. 7 0
      README.md
  2. 1 1
      models/rules.py
  3. 2 1
      views/guest.py

+ 7 - 0
README.md

@@ -180,7 +180,14 @@ curl https://raw.githubusercontent.com/jamesiter/JimV-C/master/INSTALL.sh | bash
 
 
 ### 计算节点命名
+|环境编号|环境类型|环境中计算节点序列|域|
+|:-|:-|:-|:-|
+|数字|k:KVM|数字| - |
+|1|k|01|jimv.io|
+|1|k|02|jimv.io|
+|1|k|n|jimv.io|
 
+>**备注:** 数字域的宽度是可变的,可从1~n,n可以是非个位数,如99、999(如: 1k01.jimv.io, 1k001.jimv.io)。
 
 ## 问题反馈
 

+ 1 - 1
models/rules.py

@@ -48,7 +48,7 @@ class Rules(Enum):
     RSA_PUBLIC = (basestring, 'rsa_public')
 
     UUID = (basestring, 'uuid', (36, 36))
-    NODE_ID = (basestring, 'node_id', (14, 14))
+    NODE_ID = (basestring, 'node_id', (14, 15))
     UUIDS = (REG_UUIDS, 'uuids')
     CPU = (int, 'cpu')
     MEMORY = (int, 'memory')

+ 2 - 1
views/guest.py

@@ -190,7 +190,8 @@ def vnc(uuid):
 
         port = random.randrange(50000, 60000)
 
-    payload = {'listen_port': port, 'target_host': '103.47.139.194', 'target_port': guest_ret['data']['vnc_port']}
+    payload = {'listen_port': port, 'target_host': guest_ret['data']['on_host'],
+               'target_port': guest_ret['data']['vnc_port']}
     q_ws.put(json.dumps(payload, ensure_ascii=False))
     q_ws.join()