Opensack ha traj

src/Makefile

@@ -9,9 +9,9 @@ rpm:
 	mkdir -p ~/rpmbuild/SOURCES
 	mkdir -p ~/rpmbuild/SPECS
 	mkdir -p ~/rpmbuild/SRPMS
-	cp contrail_smgr.spec ~/rpmbuild/SPECS
-	rpmbuild -bb ~/rpmbuild/SPECS/contrail_smgr.spec
-	cp ~/rpmbuild/RPMS/noarch/contrail_smgr-1.0-1.noarch.rpm ~/rpmbuild/RPMS/noarch/contrail_smgr-1.0-1_$(commit_id).noarch.rpm
+	cp contrail-server-manager.spec ~/rpmbuild/SPECS
+	rpmbuild -bb ~/rpmbuild/SPECS/contrail-server-manager.spec
+	cp ~/rpmbuild/RPMS/noarch/contrail_server-manager-1.0-1.noarch.rpm ~/rpmbuild/RPMS/noarch/contrail_server-manager-1.0-1_$(commit_id).noarch.rpm
 
 deb:
 	(cd debian-contrail-smgr; fakeroot debian/rules binary)
@@ -25,8 +25,8 @@ client-rpm:
 	mkdir -p ~/rpmbuild/SOURCES
 	mkdir -p ~/rpmbuild/SPECS
 	mkdir -p ~/rpmbuild/SRPMS
-	cp contrail_smgr_client.spec ~/rpmbuild/SPECS
-	rpmbuild -bb ~/rpmbuild/SPECS/contrail_smgr_client.spec
+	cp contrail-server-manager-client.spec ~/rpmbuild/SPECS
+	rpmbuild -bb ~/rpmbuild/SPECS/contrail-server-manager-client.spec
 
 client-deb:
 	(cd debian-contrail-smgr-client; fakeroot debian/rules binary)

src/client/cluster-5-node-interface.json

@@ -0,0 +1,27 @@
+{
+    "cluster" : [
+        {  
+            "id" : "5-node",
+            "parameters" : {
+                "router_asn": "64512",
+                "database_dir": "/home/cassandra",
+                "database_token": "",
+                "use_certificates": "False",
+                "multi_tenancy": "False",
+		"encapsulation_priority": "MPLSoUDP,MPLSoGRE,VXLAN",
+                "service_token": "contrail123",
+                "keystone_username": "admin",
+                "keystone_password": "contrail123",
+                "keystone_tenant": "admin",
+                "analytics_data_ttl": "168",
+                "subnet_mask": "255.255.255.240",
+                "gateway": "10.204.221.62",
+                "password": "c0ntrail123",
+		"haproxy": "disable",
+		"external_bgp": "",
+                "domain": "englab.juniper.net"
+                }
+        }
+    ]
+}
+

src/client/cluster.json

@@ -1,7 +1,26 @@
 {
-    "cluster": [
-        {
-            "cluster_id": "demo-cluster"
+    "cluster" : [
+        {  
+            "id" : "demo-cluster",
+            "parameters" : {
+                "router_asn": "64512",
+                "database_dir": "/home/cassandra",
+                "database_token": "",
+                "use_certificates": "False",
+                "multi_tenancy": "False",
+                "encapsulation_priority": "MPLSoUDP,MPLSoGRE,VXLAN",
+                "service_token": "contrail123",
+                "keystone_username": "admin",
+                "keystone_password": "contrail123",
+                "keystone_tenant": "admin",
+                "analytics_data_ttl": "168",
+                "haproxy": "disable",
+                "subnet_mask": "255.255.255.240",
+                "gateway": "10.204.221.46",
+                "password": "c0ntrail123",
+                "external_bgp": "",
+                "domain": "englab.juniper.net"
+                }
         }
-    ] 
-}
+    ]
+}

src/client/cluster_openstack_ha.json

@@ -0,0 +1,37 @@
+{
+    "cluster": [
+        {
+            "email": "tsurendra@juniper.net",
+            "id": "cluster1",
+            "parameters": {
+                "analytics_data_ttl": "168",
+                "database_dir": "/home/cassandra",
+                "database_token": "",
+                "domain": "contrail.juniper.net",
+                "encapsulation_priority": "MPLSoUDP,MPLSoGRE,VXLAN",
+                "external_bgp": "",
+                "gateway": "10.84.17.254",
+                "ha": "True",
+                "haproxy": "disable",
+                "keystone_password": "contrail123",
+                "keystone_tenant": "admin",
+                "keystone_username": "admin",
+                "nfs_path": "/",
+                "multi_tenancy": "False",
+                "openstack_mgmt_ip": "",
+                "openstack_passwd": "contrail123",
+                "password": "c0ntrail123",
+                "router_asn": "64512",
+                "service_token": "contrail123",
+                "storage_fsid": "00da01de-a6c2-4293-9fc9-85e39d6ea92d",
+                "storage_virsh_uuid": "69cc6a31-805a-4cc5-9b6b-0cbfefe1ba6a",
+                "subnet_mask": "255.255.255.0",
+                "use_certificates": "False",
+                "nfs_server": "",
+                "internal_vip": "10.84.17.23",
+                "uuid": "f4def0e9-7068-41c0-aafd-e70be63f4262"
+            }
+        }
+    ]
+}
+

src/client/image.json

@@ -1,22 +1,22 @@
 {
     "image": [
         {
-            "image_id": "ubuntu-12.04.3", 
-            "image_type": "ubuntu", 
-            "image_version": "ubuntu-12.04.3",
-            "image_path": "/iso/ubuntu-12.04.3-server-amd64.iso"
+            "id": "ubuntu-12.04.3", 
+            "type": "ubuntu", 
+            "version": "ubuntu-12.04.3",
+            "path": "/iso/ubuntu-12.04.3-server-amd64.iso"
         }, 
         {
-            "image_id": "centos-6.4", 
-            "image_type": "centos", 
-            "image_version": "centos-6.4",
-            "image_path": "/iso/CentOS-6.4-x86_64-minimal.iso"
+            "id": "centos-6.4", 
+            "type": "centos", 
+            "version": "centos-6.4",
+            "path": "/iso/CentOS-6.4-x86_64-minimal.iso"
         }, 
         {
-            "image_id": "contrail-ubuntu-150", 
-            "image_type": "contrail-ubuntu-package", 
-            "image_version": "contrail-ubuntu-150",
-            "image_path": "/iso/contrail-install-packages_1.03-150_all.deb"
+            "id": "contrail-ubuntu-150", 
+            "type": "contrail-ubuntu-package", 
+            "version": "contrail-ubuntu-150",
+            "path": "/iso/contrail-install-packages_1.03-150_all.deb"
         }
     ] 
 }

src/client/server-5-node-interface.json

@@ -1,137 +1,122 @@
 {
     "server": [
         {
-            "server_id": "nodec57",
-            "mac": "00:25:90:c5:58:6e",
-            "ip": "10.204.221.61",
-            "server_params" : {
-                "ifname": "eth0",
-                "compute_non_mgmt_ip": "",
+            "id": "nodec57",
+            "mac_address": "00:25:90:c5:58:6e",
+            "ip_address": "10.204.221.61",
+            "parameters" : {
+                "interface_name": "eth0",
 	    	"setup_interface": "Yes",
-                "compute_non_mgmt_gway": ""
             },
             "roles" : ["compute"],
             "cluster_id": "5-node",
-            "vns_id": "5-node",
-            "mask": "255.255.255.240",
-            "gway": "10.204.221.62",
-            "passwd": "c0ntrail123",
+            "subnet_mask": "255.255.255.240",
+            "gateway": "10.204.221.62",
+            "password": "c0ntrail123",
             "domain": "englab.juniper.net",
-            "control": {
+            "control_data_network": {
                "eth1": {
-                    "ip": "192.168.100.1/24",
-                    "gw": ""
+                    "ip_address": "192.168.100.1/24",
+                    "gateway": ""
                 }
             },
-            "power_address": "10.207.25.151"
+            "ipmi_address": "10.207.25.151"
         },
         {  
-            "server_id": "nodea4",
-            "mac": "00:25:90:a5:3b:12",
-            "ip": "10.204.221.60",
-            "server_params" : {
-                "ifname": "eth5",
-                "compute_non_mgmt_ip": "",
+            "id": "nodea4",
+            "mac_address": "00:25:90:a5:3b:12",
+            "ip_address": "10.204.221.60",
+            "parameters" : {
+                "interface_name": "eth5",
 		"setup_interface": "Yes",
-                "compute_non_mgmt_gway": ""
             },
             "roles" : ["compute"],
             "cluster_id": "5-node",
-            "vns_id": "5-node",
-            "mask": "255.255.255.240",
-            "gway": "10.204.221.62",
-            "passwd": "c0ntrail123",
+            "subnet_mask": "255.255.255.240",
+            "gateway": "10.204.221.62",
+            "password": "c0ntrail123",
             "domain": "englab.juniper.net",
-            "control": {
+            "control_data_network": {
                "bond0": {
-                    "ip": "192.168.100.2/24",
-                    "gw": ""
+                    "ip_address": "192.168.100.2/24",
+                    "gateway": ""
                 }
             },
-            "bond": {
+            "bond_interface": {
                 "bond0": {
                     "bond_options": "{'miimon': '100', 'mode': '802.3ad','xmit_hash_policy': 'layer3+4'}",
-                    "member": "['eth0', 'eth1', 'eth2', 'eth3']"
+                    "member_interfaces": "['eth0', 'eth1', 'eth2', 'eth3']"
                 }
             },
-            "power_address": "10.207.25.17"
+            "ipmi_address": "10.207.25.17"
 
         },
         {
-            "server_id": "nodec33",
-            "mac": "00:25:90:c4:82:28",
-            "ip": "10.204.221.59",
-            "server_params" : {
-                "ifname": "eth0",
+            "id": "nodec33",
+            "mac_address": "00:25:90:c4:82:28",
+            "ip_address": "10.204.221.59",
+            "parameters" : {
+                "interface_name": "eth0",
  		"setup_interface": "Yes",
-         	"compute_non_mgmt_ip": "",
-                "compute_non_mgmt_gway": ""
             },
             "roles" : ["config","collector","webui","database"],
             "cluster_id": "5-node",
-            "vns_id": "5-node",
-            "mask": "255.255.255.240",
-            "gway": "10.204.221.62",
-            "passwd": "c0ntrail123",
+            "subnet_mask": "255.255.255.240",
+            "gateway": "10.204.221.62",
+            "password": "c0ntrail123",
             "domain": "englab.juniper.net",
             "control": {
                "eth1": {
-                    "ip": "192.168.100.3/24",
-                    "gw": ""
+                    "ip_address": "192.168.100.3/24",
+                    "gateway": ""
                 }
             },
-            "power_address": "10.207.25.87"
+            "ipmi_address": "10.207.25.87"
 
         },
         {   
-            "server_id": "nodec35",
-            "mac": "00:25:90:c4:7a:70",
-            "ip": "10.204.221.58",
-            "server_params" : {
-                "ifname": "eth0",
+            "id": "nodec35",
+            "mac_address": "00:25:90:c4:7a:70",
+            "ip_address": "10.204.221.58",
+            "parameters" : {
+                "interface_name": "eth0",
 	        "setup_interface": "Yes",
-    "compute_non_mgmt_ip": "",
-                "compute_non_mgmt_gway": ""
             },
             "roles" : ["config","openstack","control"],
             "cluster_id": "5-node",
-            "vns_id": "5-node",
-            "mask": "255.255.255.240",
-            "gway": "10.204.221.62",
-            "passwd": "c0ntrail123",
+            "subnet_mask": "255.255.255.240",
+            "gateway": "10.204.221.62",
+            "password": "c0ntrail123",
             "domain": "englab.juniper.net",
             "control": {
                "eth1": {
-                    "ip": "192.168.100.4/24",
-                    "gw": ""
+                    "ip_address": "192.168.100.4/24",
+                    "gateway": ""
                 }
             },
-            "power_address": "10.207.25.89"
+            "ipmi_address": "10.207.25.89"
         },
         {   
-            "server_id": "nodec60",
-            "mac": "00:25:90:c5:59:B0",
-            "ip": "10.204.221.57",
-            "server_params" : {
-                "ifname": "eth0",
+            "id": "nodec60",
+            "mac_address": "00:25:90:c5:59:B0",
+            "ip_address": "10.204.221.57",
+            "parameters" : {
+                "interface_name": "eth0",
 	        "setup_interface": "Yes",
-    "compute_non_mgmt_ip": "",
-                "compute_non_mgmt_gway": ""
             },
             "roles" : ["config","control"],
             "cluster_id": "5-node",
-            "vns_id": "5-node",
-            "mask": "255.255.255.240",
-            "gway": "10.204.221.62",
-            "passwd": "c0ntrail123",
+            "subnet_mask": "255.255.255.240",
+            "gateway": "10.204.221.62",
+            "password": "c0ntrail123",
             "domain": "englab.juniper.net",
             "control": {
                "eth1": {
-                    "ip": "192.168.100.5/24",
-                    "gw": ""
+                    "ip_address": "192.168.100.5/24",
+                    "gateway": ""
                 }
             },
-            "power_address": "10.207.25.154"
+            "ipmi_address": "10.207.25.154"
         }
 
     ]

src/client/server-manager

@@ -11,8 +11,6 @@
 import argparse
 import pdb
 import sys
-import smgr_create
-import smgr_modify
 import smgr_delete
 import smgr_show
 import smgr_upload_image
@@ -31,7 +29,7 @@ commands_dict = {
     'provision' : smgr_provision_server.provision_server,
     'restart' : smgr_restart_server.restart_server,
     'upload_image' : smgr_upload_image.upload_image,
-    'status' : smgr_status.show_status
+    'status' : smgr_status.show_server_status
     }
 
 def server_manager(args_str=None):