</style>\r
<script type="text/javascript">\r
$(document).ready(function() {\r
- var jsondata = loadUnderlayData();\r
- $('#tbl_overlay').bootstrapTable({\r
+ //var jsondata = loadUnderlayData();\r
+ \r
+ var params = new URLSearchParams(window.location.search.slice(1));\r
+ debugger;\r
+ var jsonData = JSON.parse((params.get("jsondata")));\r
+ var tblData= [];\r
+ jsonData.accessPointList.forEach(function(accessPoint){\r
+ tblData.push({\r
+ tname:accessPoint.name,\r
+ pname:'',\r
+ vlan:accessPoint.typeSpecList[0].ethernetTpSpec.dot1qVlanList,\r
+ site:'',\r
+ ip:accessPoint.typeSpecList[0].ipTpSpec.masterIp \r
+ });\r
+ })\r
+ $('#sai').bootstrapTable({\r
//Assigning data to table\r
- data: jsondata\r
+ data: tblData\r
});\r
$('#underlayTpDataTable').bootstrapTable({\r
//Assigning data to table\r
\r
<script>\r
$(document).ready(function () {\r
- $("#overDiv").show();\r
+ \r
+ $("#dashboard").hide();\r
+ $("#nfvo_dashboard").hide()\r
+ $("#overDiv").hide();\r
$("#underDiv").hide();\r
\r
var serviceId = getQueryStringValue("serviceId");\r
+ var serviceType = getQueryStringValue("serviceType");\r
+ \r
console.log("serviceId : " + serviceId);\r
-\r
- var jsonData = loadServiceDetails(serviceId);\r
+ \r
+ var jsonData = [];\r
+ var object = {};\r
+\r
+ if("SSAR" === serviceType || "SDNO" === serviceType) \r
+ {\r
+ object.nodeType = "sdno"\r
+ jsonData[0] = object;\r
+ }\r
+ else if("NSAR" == serviceType || "NFAR" == serviceType || "NFVO" == serviceType)\r
+ {\r
+ object.nodeType = "nfvo";\r
+ jsonData[0] = object;\r
+ }\r
+ else{\r
+ jsonData = loadServiceDetails(serviceId);\r
+ }\r
+ \r
+ \r
+ \r
+ //TODO check for the \r
console.log("jsonData length: " + jsonData.length);\r
for (i = 0; i < jsonData.length; i++) {\r
- console.log("jsonData Name: " + jsonData[i].name);\r
- if (jsonData[i].name == "sdno") {\r
+ console.log("jsonData Name: " + jsonData[i].nodeType);\r
+ if (jsonData[i].nodeType.indexOf('sdn') != -1) {\r
//$("#sdnoLink").text(jsonData[i].name.toUpperCase());\r
console.log("Adding Accordian to SDNO");\r
- $("#accordion").append(addAccordionData("sdno", jsonData[i].name.toUpperCase()));\r
+ $("#accordion").append(addAccordionData("sdno", "SDNO"));\r
}\r
- else if (jsonData[i].name == "gso") {\r
+ else if (jsonData[i].nodeType.indexOf('gso') != -1) {\r
console.log("Adding Accordian to GSO");\r
- $("#accordion").append(addAccordionData("gso", jsonData[i].name.toUpperCase()));\r
+ $("#accordion").append(addAccordionData("gso", "GSO"));\r
}\r
- else if (jsonData[i].name == "nfvo") {\r
+ else if (jsonData[i].nodeType.indexOf('nfv') != -1) {\r
console.log("Adding Accordian to NFVO");\r
- $("#accordion").append(addAccordionData("nfvo", jsonData[i].name.toUpperCase()));\r
+ $("#accordion").append(addAccordionData("nfvo", "NFVO"));\r
}\r
else {\r
\r
content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="linkgso" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>OPEN-O</span></li>';\r
}\r
else if(type == "nfvo"){\r
- //content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="linknfvo" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>ZTE</span></li>';\r
+ // content += '<li onClick="fnLoadTblData(this, \''+type+'\');" id="linknfvo" class="list-group-item"><span class="glyphicon glyphicon-pencil text-primary"></span><span>ZTE</span></li>';\r
}\r
content += '</ul></div></div>';\r
return content;\r
</div>\r
</br>\r
</div>\r
+\r
</div>\r
</div>\r
</div>\r
<script type="text/javascript" src="js/bootstrap-table.min.js"></script>\r
<script type="text/javascript" src="js/gsolcm.js"></script>\r
<script type="text/javascript" src="../common/thirdparty/bootbox/bootbox.min.js"></script>\r
+ <script type="text/javascript" src="../common/thirdparty/jquery.i18n/jquery.i18n.properties-1.0.9.js"></script>\r
+ <script type="text/javascript" src="js/jquery.bootstrap-growl.min.js"></script>\r
<script type="text/javascript" src="js/jquery.isloading.min.js"></script>\r
<script type="text/javascript" src="js/jquery-ui-1.12.1.min.js"></script>\r
<link href="css/jquery-ui-1.12.1.min.css" rel="stylesheet" />\r
$("#inpContMod").hide();\r
\r
$('#sai').bootstrapTable({}) .on('click-row.bs.table', function (e, row, $element) {\r
- var newURL = "accorTables.html?serviceId="+row.serviceId;\r
+\r
+ var newURL = "accorTables.html?serviceId="+row.serviceId + "&serviceType="+row.serviceType;\r
+ // var newURL = "accorTables.html?serviceId="+row.serviceId ;\r
console.log("URL: "+newURL);\r
document.getElementById("tabContainer").style.display = "none";\r
document.getElementById("detailConObj").setAttribute('data', newURL);\r
var lcmHandler = function () {
this._addOwnEvents();
+ jQuery.i18n.properties({
+ language:'en-US',
+ name:'lcm-template-parameters-i18n',
+ path:'i18n/',
+ mode:'map'
+ });
};
lcmHandler.prototype = {
function generateComponent(inputPara) {
var component = '<div class="mT15 form-group" style="margin-left:25px;">' +
'<label class="col-sm-3 control-label">' +
- '<span>' + inputPara.showName + '</span>' + generateRequiredLabel(inputPara) +
+ '<span>' + showName(inputPara) + '</span>' + generateRequiredLabel(inputPara) +
'</label>' +
'<div class="col-sm-7">' +
'<input type="text" id="' + inputPara.id + '" name="parameter description" class="form-control" placeholder="' +
- inputPara.showName + '" value="' + inputPara.value + '" />' +
+ showName(inputPara) + '" value="' + inputPara.value + '" />' +
'</div></div>';
return component;
}
+function showName(inputPara) {
+ var name = $.i18n.prop(inputPara.name)
+ if(name.length === 0 || name.slice(0, 1) === '[') {
+ name = inputPara.showName;
+ }
+ return name;
+}
+
function generateRequiredLabel(parameter) {
var requiredLabel = '';
if (parameter.required === 'true') {
} else if (serviceType === 'NFVO') {
var nfvoLcmUri = '/openoapi/nslcm/v1';
deleteNonGsoServiceInstance(gatewayService, nfvoLcmUri, instanceId, remove, failFun);
- } else if (serviceType === 'SDNO') {
+ } else if (serviceType === 'SDNO' || serviceType === 'SSAR') {
var sdnoLcmUri = '/openoapi/sdnonslcm/v1';
deleteNonGsoServiceInstance(gatewayService, sdnoLcmUri, instanceId, remove, failFun);
}
}
},
$restUrl: {
- queryNodeInstanceUrl: "/openoapi/nslcm/v1.0/ns/"
+ queryNodeInstanceUrl: "/openoapi/nslcm/v1/ns/"
},
$init: function () {
vm.$initInstanceData();
],
"aaData": tableData
});
- };
+ },
//nodes list table
nodesList :{
var instanceId = params[0].substring(params[0].indexOf('=') + 1);
vm.instanceId = instanceId;
- vm.$restUrl.queryNodeInstanceUrl = commonUtil.format(vm.$restUrl.queryNodeInstanceUrl, instanceId);
+ vm.$restUrl.queryNodeInstanceUrl = vm.$restUrl.queryNodeInstanceUrl + instanceId;
vm.$init();
}
};
console.log("URL = " + JSON.stringify(url));\r
});\r
\r
-function loadUnderlayData() {\r
- var requestUrl = url.underlay + "/openoapi/sdnol3vpn/v1/l3vpns";\r
+function loadUnderlayData(serviceId) {\r
+ var requestUrl = "/openoapi/sdnol3vpn/v1/l3vpns/" + serviceId;\r
+ var returnObj;\r
$\r
.ajax({\r
type: "GET",\r
url: requestUrl,\r
+ async: false,\r
contentType: "application/json",\r
success: function (jsonobj) {\r
- alert("loading underlay data");\r
- //TODO: Update the table\r
+ returnObj = jsonobj;\r
},\r
error: function (xhr, ajaxOptions, thrownError) {\r
//alert("Error on getting underlay data : " + xhr.responseText);\r
}\r
});\r
+ return returnObj;\r
}\r
function deleteUnderlayData(objectId) {\r
- var requestUrl = url.underlay + "/openoapi/sdnol3vpn/v1/l3vpns/" + objectId;\r
+ var requestUrl = "/openoapi/sdnol3vpn/v1/l3vpns/" + objectId;\r
$\r
.ajax({\r
type: "DELETE",\r
}\r
});\r
}\r
-function loadOverlayData() {\r
- var requestUrl = url.overlay + "/openoapi/sdnooverlayvpn/v1/site2dc-vpn";\r
+function loadOverlayData(serviceId) {\r
+ var requestUrl = "/openoapi/sdnooverlay/v1/site2dc-vpn/" + serviceId;\r
+ var returnObj;\r
$\r
.ajax({\r
type: "GET",\r
url: requestUrl,\r
+ async: false,\r
contentType: "application/json",\r
success: function (jsonobj) {\r
- alert("loading Overlay data...");\r
- //TODO: Update the table\r
+ returnObj = jsonobj;\r
},\r
error: function (xhr, ajaxOptions, thrownError) {\r
//alert("Error on getting Overlayvpn data : " + xhr.responseText);\r
}\r
});\r
+ return returnObj;\r
}\r
function refressTpDataTable(overlayTable, TpTable) {\r
alert("refesssing Tp data table");\r
var formData = JSON.stringify($("#underlayForm").serializeObject());\r
alert(formData);\r
var jsonobj = JSON.parse(formData);\r
- var requestUrl = url.underlay + "/openoapi/sdnol3vpn/v1/l3vpns";\r
+ var requestUrl = "/openoapi/sdnol3vpn/v1/l3vpns";\r
$\r
.ajax({\r
type: "POST",\r
\r
function deleteSite(objectId) {\r
alert(objectId);\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/sites" + objectId;\r
+ var requestUrl = "/openoapi/sdnobrs/v1/sites" + objectId;\r
$\r
.ajax({\r
type: "DELETE",\r
});\r
}\r
function deleteLink(objectId) {\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/topological-links" + objectId;\r
+ var requestUrl = "/openoapi/sdnobrs/v1/topological-links" + objectId;\r
$\r
.ajax({\r
type: "DELETE",\r
}\r
\r
function deleteNe(objectId) {\r
- var requestUrl = url + "/sdnobrs/v1/managed-elements" + objectId;\r
+ var requestUrl = "/sdnobrs/v1/managed-elements" + objectId;\r
$\r
.ajax({\r
type: "DELETE",\r
}\r
\r
function deletePort(objectId) {\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/logical-termination-points" + objectId;\r
+ var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points" + objectId;\r
$\r
.ajax({\r
type: "DELETE",\r
});\r
}\r
function loadSiteData() {\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/sites";\r
+ var requestUrl = "/openoapi/sdnobrs/v1/sites";\r
$\r
.ajax({\r
type: "GET",\r
});\r
}\r
function loadLinkData() {\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/topological-links";\r
+ var requestUrl = "/openoapi/sdnobrs/v1/topological-links";\r
$\r
.ajax({\r
type: "GET",\r
});\r
}\r
function loadNeData() {\r
- var requestUrl = url + "/sdnobrs/v1/managed-elements";\r
+ var requestUrl = "/sdnobrs/v1/managed-elements";\r
$\r
.ajax({\r
type: "GET",\r
});\r
}\r
function loadPortData() {\r
- var requestUrl = url + "/openoapi/sdnobrs/v1/logical-termination-points";\r
+ var requestUrl = "/openoapi/sdnobrs/v1/logical-termination-points";\r
$\r
.ajax({\r
type: "GET",\r
<script type="text/javascript">\r
$(document).ready(function () {\r
var jsondata = [];\r
- jsondata = loadOverlayData();\r
+ var params = new URLSearchParams(window.location.search.slice(1));\r
+ var serviceId = params.get("serviceId");\r
+ jsondata = loadOverlayData(serviceId);\r
+ var tabData = [];\r
+ \r
+ var tableRow = {};\r
+ tableRow.desc = jsondata.description;\r
+ tableRow.name= jsondata.name;\r
+ tableRow.thinCpe= jsondata.site.cidr;//TODO\r
+ tableRow.port = "";\r
+ //tableRow.dcName=jsondata.vpc.name;\r
+ tableRow.vpc = jsondata.vpc.name;\r
+ tableRow.vpcCidr= jsondata.vpc.site.cidr;\r
+ tabData[0]=tableRow;\r
+\r
\r
$('#sai').bootstrapTable({\r
//Assigning data to table\r
- data: jsondata\r
+ data: tabData\r
});\r
$('.table tbody tr').click(function () {\r
$(this).addClass('openoTable_row_selected').siblings().removeClass('openoTable_row_selected');\r
<tr>\r
<th data-field="name" data-sortable="true" data-filter-control="input">Name</th>\r
<th data-field="desc" data-sortable="true" data-filter-control="input">Description</th>\r
- <th data-field="thinCpe" data-sortable="true" data-filter-control="input">Thin CPE</th>\r
+ <th data-field="thinCpe" data-sortable="true" data-filter-control="input">Site CIDR</th>\r
<th data-field="port" data-sortable="true" data-filter-control="input">Port:Vlan ID</th>\r
- <th data-field="dcName" data-sortable="true" data-filter-control="input">DC Name</th>\r
- <th data-field="vpc" data-sortable="true" data-filter-control="input">VPC</th>\r
+ <!-- <th data-field="dcName" data-sortable="true" data-filter-control="input">DC Name</th> -->\r
+ <th data-field="vpc" data-sortable="true" data-filter-control="input">VPC Name</th>\r
<th data-field="vpcCidr" data-sortable="true" data-filter-control="input">VPC CIDR</th>\r
<th data-field="action" data-sortable="">Action</th>\r
</tr>\r
</div>\r
</div>\r
\r
-\r
+</div>\r
</body>\r
</html>
\ No newline at end of file
<script type="text/javascript">\r
$(document).ready(function () {\r
\r
-\r
- var jsondata = loadUnderlayData();\r
- $('#tbl_overlay').bootstrapTable({\r
+ var params = new URLSearchParams(window.location.search.slice(1));\r
+ var serviceId = params.get("serviceId");\r
+ var jsondata = loadUnderlayData(serviceId);\r
+ var tabData = [];\r
+ var tableRow = {};\r
+ tableRow.name = jsondata.name;\r
+ tableRow.desc= jsondata.description;\r
+ tableRow.state= jsondata.operStatus;//TODO\r
+ tabData[0] = tableRow;\r
+ $('#sai').bootstrapTable({\r
//Assigning data to table\r
- data: jsondata\r
+ data: tabData\r
});\r
$('#underlayTpDataTable').bootstrapTable({\r
//Assigning data to table\r
});\r
\r
});\r
-\r
- var serviceId = getQueryStringValue("serviceId");\r
console.log("underlayvpn - serviceId : " + serviceId);\r
-\r
+ $("#underlay_tp").attr('data', 'UnderLay_TP.html?jsondata='+JSON.stringify(jsondata));\r
});\r
\r
function getQueryStringValue (key) {\r
</div>\r
\r
<div id="tpDiv">\r
- <iframe src="UnderLay_TP.html" style="width:100%;height:450px;" name="targetframe" allowTransparency="true" scrolling="no" frameborder="0">\r
- </iframe>\r
+ <object id="underlay_tp" data="UnderLay_TP.html" width="100%" height="450" type="text/html"></object>\r
+ <!--<iframe src="UnderLay_TP.html" style="width:100%;height:450px;" name="targetframe" allowTransparency="true" scrolling="no" frameborder="0">\r
+ </iframe>-->\r
</div>\r
<div id="filterTpLogicalType_select_popupcontainer" class="openo openo-select-popup-container openo-hide"\r
style="width: 155px; max-height: 130px; left: 628px; top: 104px; z-index: 1761;">\r
Code Review / vnfsdk / refrepo.git / commitdiff