cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [2/2] git commit: updated refs/heads/cisco-vnmc-api-integration to bcecb58
Date Mon, 01 Apr 2013 08:29:46 GMT
Some xml file renames


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

Branch: refs/heads/cisco-vnmc-api-integration
Commit: bcecb589de84caa570754c246565dfaa1cb1c2bf
Parents: 9c1ee93
Author: Koushik Das <koushik.das@citrix.com>
Authored: Mon Apr 1 13:57:21 2013 +0530
Committer: Koushik Das <koushik.das@citrix.com>
Committed: Mon Apr 1 13:57:21 2013 +0530

----------------------------------------------------------------------
 .../network/cisco/create-acl-rule-for-dnat.xml     |   82 ++++++++
 .../network/cisco/create-acl-rule-for-pf.xml       |  156 +++++++++++++++
 .../cisco/create-ingress-acl-rule-for-dnat.xml     |   82 --------
 .../cisco/create-ingress-acl-rule-for-pf.xml       |  156 ---------------
 .../network/cisco/CiscoVnmcConnectionImpl.java     |    4 +-
 5 files changed, 240 insertions(+), 240 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcecb589/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
new file mode 100755
index 0000000..5b6aaa3
--- /dev/null
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml
@@ -0,0 +1,82 @@
+<!--
+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.
+-->
+<configConfMos
+  cookie="%cookie%"
+  inHierarchical="false">
+  <inConfigs>
+
+    <pair key="%aclruledn%">
+      <policyRule
+        descr="%descr%"
+        dn="%aclruledn%"
+        name="%aclrulename%"
+        order="%order%"
+        status="created"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-action-0">
+      <fwpolicyAction
+        actionType="%actiontype%"
+        dn="%aclruledn%/rule-action-0"
+        id="0"
+        status="created"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-cond-2">
+      <policyRuleCondition
+        dn="%aclruledn%/rule-cond-2"
+        id="2"
+        order="unspecified"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-2/nw-expr2">
+      <policyNetworkExpression
+        dn="%aclruledn%/rule-cond-2/nw-expr2"
+        id="2"
+        opr="eq"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-attr-qual">
+      <policyNwAttrQualifier
+        attrEp="destination"
+        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-attr-qual"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-ip-2">
+      <policyIPAddress
+        dataType="string"
+        descr=""
+        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-ip-2"
+        id="2"
+        name=""
+        placement="none"
+        status="created"
+        value="%ip%"/>
+    </pair>
+
+  </inConfigs>
+</configConfMos>
+
+<!--
+    aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
+    aclrulename="dummy"
+    descr=value
+    actiontype="drop" or "permit"
+    ip="public ip at destination"
+--!>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcecb589/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
new file mode 100755
index 0000000..1a1d9cb
--- /dev/null
+++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml
@@ -0,0 +1,156 @@
+<!--
+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.
+-->
+<configConfMos
+  cookie="%cookie%"
+  inHierarchical="false">
+  <inConfigs>
+
+    <pair key="%aclruledn%">
+      <policyRule
+        descr="%descr%"
+        dn="%aclruledn%"
+        name="%aclrulename%"
+        order="%order%"
+        status="created"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-action-0">
+      <fwpolicyAction
+        actionType="%actiontype%"
+        dn="%aclruledn%/rule-action-0"
+        id="0"
+        status="created"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-cond-2">
+      <policyRuleCondition
+        dn="%aclruledn%/rule-cond-2"
+        id="2"
+        order="unspecified"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-2/nw-expr2">
+      <policyNetworkExpression
+        dn="%aclruledn%/rule-cond-2/nw-expr2"
+        id="2"
+        opr="eq"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-protocol-2">
+      <policyProtocol
+        dataType="string"
+        descr=""
+        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-protocol-2"
+        id="2"
+        name=""
+        placement="none"
+        status="created"
+        value="%protocolvalue%"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-cond-3">
+      <policyRuleCondition
+        dn="%aclruledn%/rule-cond-3"
+        id="3"
+        order="unspecified"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-3/nw-expr2">
+      <policyNetworkExpression
+        dn="%aclruledn%/rule-cond-3/nw-expr2"
+        id="2"
+        opr="eq"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-3/nw-expr2/nw-attr-qual">
+      <policyNwAttrQualifier
+        attrEp="destination"
+        dn="%aclruledn%/rule-cond-3/nw-expr2/nw-attr-qual"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-3/nw-expr2/nw-ip-2">
+      <policyIPAddress
+        dataType="string"
+        descr=""
+        dn="%aclruledn%/rule-cond-3/nw-expr2/nw-ip-2"
+        id="2"
+        name=""
+        placement="begin"
+        status="created"
+        value="%ip%"/>
+    </pair>
+
+    <pair key="%aclruledn%/rule-cond-4">
+      <policyRuleCondition
+        dn="%aclruledn%/rule-cond-4"
+        id="4"
+        order="unspecified"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-4/nw-expr2">
+      <policyNetworkExpression
+        dn="%aclruledn%/rule-cond-4/nw-expr2"
+        id="2"
+        opr="range"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-attr-qual">
+      <policyNwAttrQualifier
+        attrEp="destination"
+        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-attr-qual"
+        status="created"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-port-2">
+      <policyNetworkPort
+        appType="Other"
+        dataType="string"
+        descr=""
+        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-port-2"
+        id="2"
+        name=""
+        placement="begin"
+        status="created"
+        value="%startport%"/>
+    </pair>
+    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-port-3">
+      <policyNetworkPort
+        appType="Other"
+        dataType="string"
+        descr=""
+        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-port-3"
+        id="3"
+        name=""
+        placement="end"
+        status="created"
+        value="%endport%"/>
+    </pair>
+
+  </inConfigs>
+</configConfMos>
+
+<!--
+    aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
+    aclrulename="dummy"
+    descr=value
+    actiontype="drop" or "permit"
+    protocolvalue="TCP" or "UDP"
+    ip="public ip at destination"
+    startport="start port at destination"
+    endport="end port at destination"
+--!>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcecb589/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-dnat.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-dnat.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-dnat.xml
deleted file mode 100755
index 5b6aaa3..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-dnat.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<!--
-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.
--->
-<configConfMos
-  cookie="%cookie%"
-  inHierarchical="false">
-  <inConfigs>
-
-    <pair key="%aclruledn%">
-      <policyRule
-        descr="%descr%"
-        dn="%aclruledn%"
-        name="%aclrulename%"
-        order="%order%"
-        status="created"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-action-0">
-      <fwpolicyAction
-        actionType="%actiontype%"
-        dn="%aclruledn%/rule-action-0"
-        id="0"
-        status="created"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-cond-2">
-      <policyRuleCondition
-        dn="%aclruledn%/rule-cond-2"
-        id="2"
-        order="unspecified"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-2/nw-expr2">
-      <policyNetworkExpression
-        dn="%aclruledn%/rule-cond-2/nw-expr2"
-        id="2"
-        opr="eq"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-attr-qual">
-      <policyNwAttrQualifier
-        attrEp="destination"
-        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-attr-qual"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-ip-2">
-      <policyIPAddress
-        dataType="string"
-        descr=""
-        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-ip-2"
-        id="2"
-        name=""
-        placement="none"
-        status="created"
-        value="%ip%"/>
-    </pair>
-
-  </inConfigs>
-</configConfMos>
-
-<!--
-    aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
-    aclrulename="dummy"
-    descr=value
-    actiontype="drop" or "permit"
-    ip="public ip at destination"
---!>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcecb589/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
deleted file mode 100755
index 1a1d9cb..0000000
--- a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule-for-pf.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<!--
-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.
--->
-<configConfMos
-  cookie="%cookie%"
-  inHierarchical="false">
-  <inConfigs>
-
-    <pair key="%aclruledn%">
-      <policyRule
-        descr="%descr%"
-        dn="%aclruledn%"
-        name="%aclrulename%"
-        order="%order%"
-        status="created"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-action-0">
-      <fwpolicyAction
-        actionType="%actiontype%"
-        dn="%aclruledn%/rule-action-0"
-        id="0"
-        status="created"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-cond-2">
-      <policyRuleCondition
-        dn="%aclruledn%/rule-cond-2"
-        id="2"
-        order="unspecified"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-2/nw-expr2">
-      <policyNetworkExpression
-        dn="%aclruledn%/rule-cond-2/nw-expr2"
-        id="2"
-        opr="eq"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-2/nw-expr2/nw-protocol-2">
-      <policyProtocol
-        dataType="string"
-        descr=""
-        dn="%aclruledn%/rule-cond-2/nw-expr2/nw-protocol-2"
-        id="2"
-        name=""
-        placement="none"
-        status="created"
-        value="%protocolvalue%"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-cond-3">
-      <policyRuleCondition
-        dn="%aclruledn%/rule-cond-3"
-        id="3"
-        order="unspecified"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-3/nw-expr2">
-      <policyNetworkExpression
-        dn="%aclruledn%/rule-cond-3/nw-expr2"
-        id="2"
-        opr="eq"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-3/nw-expr2/nw-attr-qual">
-      <policyNwAttrQualifier
-        attrEp="destination"
-        dn="%aclruledn%/rule-cond-3/nw-expr2/nw-attr-qual"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-3/nw-expr2/nw-ip-2">
-      <policyIPAddress
-        dataType="string"
-        descr=""
-        dn="%aclruledn%/rule-cond-3/nw-expr2/nw-ip-2"
-        id="2"
-        name=""
-        placement="begin"
-        status="created"
-        value="%ip%"/>
-    </pair>
-
-    <pair key="%aclruledn%/rule-cond-4">
-      <policyRuleCondition
-        dn="%aclruledn%/rule-cond-4"
-        id="4"
-        order="unspecified"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-4/nw-expr2">
-      <policyNetworkExpression
-        dn="%aclruledn%/rule-cond-4/nw-expr2"
-        id="2"
-        opr="range"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-attr-qual">
-      <policyNwAttrQualifier
-        attrEp="destination"
-        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-attr-qual"
-        status="created"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-port-2">
-      <policyNetworkPort
-        appType="Other"
-        dataType="string"
-        descr=""
-        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-port-2"
-        id="2"
-        name=""
-        placement="begin"
-        status="created"
-        value="%startport%"/>
-    </pair>
-    <pair key="%aclruledn%/rule-cond-4/nw-expr2/nw-port-3">
-      <policyNetworkPort
-        appType="Other"
-        dataType="string"
-        descr=""
-        dn="%aclruledn%/rule-cond-4/nw-expr2/nw-port-3"
-        id="3"
-        name=""
-        placement="end"
-        status="created"
-        value="%endport%"/>
-    </pair>
-
-  </inConfigs>
-</configConfMos>
-
-<!--
-    aclruledn="org-root/org-vlan-123/org-VDC-vlan-123/pol-test_policy/rule-dummy"
-    aclrulename="dummy"
-    descr=value
-    actiontype="drop" or "permit"
-    protocolvalue="TCP" or "UDP"
-    ip="public ip at destination"
-    startport="start port at destination"
-    endport="end port at destination"
---!>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bcecb589/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
index 29b5efe..0196dc5 100644
--- a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
+++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java
@@ -79,9 +79,9 @@ public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection {
         CREATE_IP_POOL("create-ip-pool.xml", "policy-mgr"),
 
         CREATE_PF_RULE("create-pf-rule.xml", "policy-mgr"),
-        CREATE_ACL_RULE_FOR_PF("create-ingress-acl-rule-for-pf.xml", "policy-mgr"),
+        CREATE_ACL_RULE_FOR_PF("create-acl-rule-for-pf.xml", "policy-mgr"),
         CREATE_DNAT_RULE("create-dnat-rule.xml", "policy-mgr"),
-        CREATE_ACL_RULE_FOR_DNAT("create-ingress-acl-rule-for-dnat.xml", "policy-mgr"),
+        CREATE_ACL_RULE_FOR_DNAT("create-acl-rule-for-dnat.xml", "policy-mgr"),
         CREATE_SOURCE_NAT_RULE("create-source-nat-rule.xml", "policy-mgr"),
 
         CREATE_ACL_POLICY_SET("create-acl-policy-set.xml", "policy-mgr"),


Mime
View raw message