updated ReserachEnvironmentMetadata

Author: dweinholz

scripts/generate_new_test_pems.sh

@@ -2,8 +2,12 @@
 echo Creating new dir "new_pem"
 mkdir $1
 cd $1
-openssl req -new -x509 -nodes -days 3000 -out server.crt -keyout server.key -subj "/C=DE/ST=./L=./O=./CN=$1"
+if [[ "$1" =~ ^(([1-9]?[0-9]|1[0-9][0-9]|2([0-4][0-9]|5[0-5]))\.){3}([1-9]?[0-9]|1[0-9][0-9]|2([0-4][0-9]|5[0-5]))$ ]]; then
+  openssl req -new -x509 -nodes -days 3000 -out server.crt -keyout server.key -subj "/C=DE/ST=./L=./O=./CN=$1" --addext "subjectAltName=IP:$1"
+else
+  openssl req -new -x509 -nodes -days 3000 -out server.crt -keyout server.key -subj "/C=DE/ST=./L=./O=./CN=$1"
 
+fi
 openssl x509 -in server.crt -text > CA.pem
 cat server.crt server.key > server.pem
 openssl pkcs12 -export -clcerts -in server.crt -inkey server.key -out server.p12  -passout pass:thrift

simple_vm_client/VirtualMachineService-remote

@@ -17,8 +17,9 @@ else:
 
 from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 from thrift.transport import THttpClient, TSocket, TSSLSocket, TTransport
-from VirtualMachineService import VirtualMachineService
-from VirtualMachineService.ttypes import *
+import VirtualMachineService
+import ttypes
+
 
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
     print('')