cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject git commit: updated refs/heads/4.4 to b6b25b1
Date Sun, 04 May 2014 19:20:23 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 bed54474d -> b6b25b1ec


- Created new devcloud advanced networking config file (devcloud-advanced_juniper-contrail.cfg).
- Modification to deployDataCenter script, to enable "JuniperContrailRouter" & "JuniperContrailVpcRouter"
providers.

Signed-off-by: Daan Hoogland <daan@onecht.net>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b6b25b1e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b6b25b1e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b6b25b1e

Branch: refs/heads/4.4
Commit: b6b25b1ec68f7afe6f955debf800282c2529b1e5
Parents: bed5447
Author: Sachchidanand Vaidya <vaidyasd@juniper.net>
Authored: Fri May 2 16:22:14 2014 -0700
Committer: Daan Hoogland <daan@onecht.net>
Committed: Sun May 4 21:19:11 2014 +0200

----------------------------------------------------------------------
 .../devcloud-advanced_juniper-contrail.cfg      | 123 +++++++++++++++++++
 tools/marvin/marvin/deployDataCenter.py         |   7 ++
 2 files changed, 130 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6b25b1e/tools/devcloud/devcloud-advanced_juniper-contrail.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud-advanced_juniper-contrail.cfg b/tools/devcloud/devcloud-advanced_juniper-contrail.cfg
new file mode 100644
index 0000000..35b551a2
--- /dev/null
+++ b/tools/devcloud/devcloud-advanced_juniper-contrail.cfg
@@ -0,0 +1,123 @@
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+# This configuration is meant for running advanced networking , with management server on
the laptop,
+# It requires that the user run a DNS resolver within devcloud via 'apt-get install dnsmasq'
+#
+#
+{
+    "zones": [
+        {
+            "localstorageenabled": "true",
+            "name": "default",
+            "dns1": "8.8.8.8",
+            "physical_networks": [
+                {
+                    "broadcastdomainrange": "Zone",
+                    "name": "ip-fabric",
+                    "traffictypes": [
+                        {
+                            "xen": "Pool-wide network associated with eth0",
+                            "typ": "Management"
+                        },
+                        {
+                            "xen": "Pool-wide network associated with eth0",
+                            "typ": "Guest"
+                        },
+                        {
+                            "xen": "Pool-wide network associated with eth1",
+                            "typ": "Public"
+                        }
+                    ],
+                    "providers": [
+                        {
+                            "broadcastdomainrange": "ZONE",
+                            "name": "JuniperContrailRouter"
+                        }
+                    ],
+                    "isolationmethods": [
+                        "L3VPN"
+                    ]
+                }
+            ],
+            "ipranges": [
+                {
+                    "startip": "10.0.3.100",
+                    "endip": "10.0.3.199",
+                    "netmask": "255.255.255.0",
+                    "vlan": "untagged",
+                    "gateway": "10.0.3.2"
+                }
+            ],
+            "networktype": "Advanced",
+            "pods": [
+                {
+                    "endip": "192.168.56.249",
+                    "name": "a6",
+                    "startip": "192.168.56.200",
+                    "netmask": "255.255.255.0",
+                    "clusters": [
+                        {
+                            "clustername": "a6-xen",
+                            "hypervisor": "XenServer",
+                            "hosts": [
+                                {
+                                    "username": "root",
+                                    "url": "http://192.168.56.10/",
+                                    "password": "password"
+                                }
+                            ],
+                            "clustertype": "CloudManaged"
+                        }
+                    ],
+                    "gateway": "192.168.56.1"
+                }
+            ],
+            "internaldns1": "192.168.56.10",
+            "secondaryStorages": [
+                {
+                    "url": "nfs://192.168.56.10:/opt/storage/secondary",
+                    "provider": "NFS",
+                    "details": [ ]
+                }
+            ]
+        }
+    ],
+    "dbSvr": {
+        "dbSvr": "127.0.0.1",
+        "passwd": "cloud",
+        "db": "cloud",
+        "port": 3306,
+        "user": "cloud"
+    },
+    "logger": [
+        {
+            "name": "TestClient",
+            "file": "/var/log/testclient.log"
+        },
+        {
+            "name": "TestCase",
+            "file": "/var/log/testcase.log"
+        }
+    ],
+    "mgtSvr": [
+        {
+            "mgtSvrIp": "127.0.0.1",
+            "port": 8096
+        }
+    ]
+}

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b6b25b1e/tools/marvin/marvin/deployDataCenter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py
index c4f6e1e..e5a0749 100644
--- a/tools/marvin/marvin/deployDataCenter.py
+++ b/tools/marvin/marvin/deployDataCenter.py
@@ -300,6 +300,13 @@ class deployDataCenters(object):
                     self.enableProvider(pnetprovres[0].id)
                 elif provider.name == 'SecurityGroupProvider':
                     self.enableProvider(pnetprovres[0].id)
+            elif provider.name in ['JuniperContrailRouter', 'JuniperContrailVpcRouter']:
+                netprov = addNetworkServiceProvider.\
+                    addNetworkServiceProviderCmd()
+                netprov.name = provider.name
+                netprov.physicalnetworkid = phynetwrk.id
+                result = self.apiClient.addNetworkServiceProvider(netprov)
+                self.enableProvider(result.id)
             elif provider.name in ['Netscaler', 'JuniperSRX', 'F5BigIp']:
                 netprov = addNetworkServiceProvider.\
                     addNetworkServiceProviderCmd()


Mime
View raw message