Skip to content

Update keys #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rizard merged 2 commits into from
Sep 1, 2016
Merged

Update keys #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
83cc1e8
update keys
rizard Sep 1, 2016
e4163e3
Fix merge conflicts w/@cbarrin
rizard Sep 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions pages/acl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ <h4 class="modal-title" id="myModalLabel2">Create Rule</h4>

<script>
var ipaddress = $.cookie('cip');
var port = $.cookie('cport');
if (ipaddress == null || ipaddress == "") window.location.href = "login.html";

$("#btnAddRule").click(function () {
Expand Down Expand Up @@ -248,7 +249,7 @@ <h4 class="modal-title" id="myModalLabel2">Create Rule</h4>
$.ajax({
type : "POST",
dataType: 'json',
url : "http://" + ipaddress + ":8080/wm/acl/rules/json",
url : "http://" + ipaddress + ":" + port + "/wm/acl/rules/json",
data : postData,
success : function (data) {

Expand Down Expand Up @@ -284,7 +285,7 @@ <h4 class="modal-title" id="myModalLabel2">Create Rule</h4>

function GetRules() {

var url = "http://" + ipaddress + ":8080/wm/acl/rules/json";
var url = "http://" + ipaddress + ":" + port + "/wm/acl/rules/json";

$(document).ready(function () {

Expand Down Expand Up @@ -335,7 +336,7 @@ <h4 class="modal-title" id="myModalLabel2">Create Rule</h4>
$.ajax({
type : "DELETE",
dataType: 'json',
url : "http://" + ipaddress + ":8080/wm/acl/rules/json",
url : "http://" + ipaddress + ":" + port + "/wm/acl/rules/json",
data : '{ "ruleid":' + "\"" + ruleId + "\"" + '}',
success : function (data) {

Expand Down Expand Up @@ -370,7 +371,7 @@ <h4 class="modal-title" id="myModalLabel2">Create Rule</h4>
$.ajax({
type : "GET",
dataType: "json",
url : "http://" + ipaddress + ":8080/wm/acl/clear/json",
url : "http://" + ipaddress + ":" + port + "/wm/acl/clear/json",
success : function (data) {

new PNotify({
Expand Down
2 changes: 1 addition & 1 deletion pages/flowPusher.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ <h4 class="modal-title" id="myModalLabel2">Create</h4>
+ "<td>" + objValue["outPort"] + "</td>"
+ "<td>" + objValue["flags"] + "</td>"
+ "<td>" + objValue["match"]["in_port"] + "</td>"
+ "<td>" + objValue["instructions"]["instruction_apply_actions"].actions + "</td>"
+ "<td>" + JSON.stringify(objValue["instructions"]) + "</td>"
+ "<td><input type='button' value='Delete' class='btn btn-xs btn-danger' onclick=" + "\"" + "DeleteRule('" + propName + "');" + "\"" + "/></td>"
+ "</tr>";
}
Expand Down
2 changes: 1 addition & 1 deletion pages/hosts.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ <h3 class="page-header">Hosts</h3>
{data: 'mac'},
{data: 'ipv4'},
{data: 'ipv6'},
{data: 'attachmentPoint[0].switchDPID'},
{data: 'attachmentPoint[0].switch'},
{data: 'attachmentPoint[0].port'},
{data: 'lastSeen'}
]
Expand Down
12 changes: 6 additions & 6 deletions pages/switchDetail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="">
<meta name="author" content="">
<title>SB Admin 2 - Bootstrap Admin Theme</title>
<title>Switch Detail</title>
<!-- Bootstrap Core CSS -->
<link href="../bower_components/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- MetisMenu CSS -->
Expand Down Expand Up @@ -463,11 +463,11 @@ <h4 class="modal-title" id="myModalLabel2">Bandwitdh Consumption</h4>
success: function (data) {

$(".version").html(data.desc["version"]);
$("#hardwareDescription").html(data.desc["hardwareDescription"]);
$("#manufacturerDescription").html(data.desc["manufacturerDescription"]);
$("#softwareDescription").html(data.desc["softwareDescription"]);
$("#serialNumber").html(data.desc["serialNumber"]);
$("#datapathDescription").html(data.desc["datapathDescription"]);
$("#hardwareDescription").html(data.desc["hardware_description"]);
$("#manufacturerDescription").html(data.desc["manufacturer_description"]);
$("#softwareDescription").html(data.desc["software_description"]);
$("#serialNumber").html(data.desc["serial_number"]);
$("#datapathDescription").html(data.desc["datapath_description"]);

if (sId != "")
$(".macAddress").html(sId);
Expand Down