Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history 
# Conflicts:
#	src/main/java/org/project/openbaton/nubomedia/api/core/NubomediaAppManager.java
  • Loading branch information
@charliemaiors
charliemaiors committed Apr 18, 2016
2 parents ddda4a0 + d229091 commit 546ae41
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 93 deletions.
13 changes: 9 additions & 4 deletions src/main/java/org/project/openbaton/nubomedia/api/core/NubomediaAppManager.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package org.project.openbaton.nubomedia.api.core;

import org.openbaton.catalogue.mano.common.Ip;
import org.openbaton.catalogue.mano.common.LifecycleEvent;
import org.openbaton.catalogue.mano.descriptor.VirtualDeploymentUnit;
import org.openbaton.catalogue.mano.record.VNFCInstance;
import org.openbaton.catalogue.mano.record.VirtualNetworkFunctionRecord;
Expand Down Expand Up @@ -84,7 +83,7 @@ private void init() {
throw new NameStructureException("Name must match [a-z0-9]+(?:[._-][a-z0-9]+)*");
}

if(!appRepo.findByAppName(request.getAppName()).isEmpty()){
if (!appRepo.findByAppName(request.getAppName()).isEmpty()) {
throw new DuplicatedException("Application with " + request.getAppName() + " already exist");
}

Expand All @@ -110,7 +109,7 @@ private void init() {

//Openbaton MediaServer Request
logger.info("[PAAS]: EVENT_APP_CREATE " + new Date().getTime());
OpenbatonCreateServer openbatonCreateServer = obmanager.getMediaServerGroupID(request.getFlavor(),appID,paaSProperties.getInternalURL(),request.isCloudRepository(), request.isCdnConnector(), request.getQualityOfService(),request.isTurnServerActivate(),request.getTurnServerUrl(),request.getTurnServerUsername(),request.getTurnServerPassword(),request.isStunServerActivate(), request.getStunServerIp(), request.getStunServerPort(), request.getScaleInOut(),request.getScale_out_threshold());
OpenbatonCreateServer openbatonCreateServer = obmanager.getMediaServerGroupID(request.getFlavor(),appID,paaSProperties.getInternalURL(),request.isCloudRepository(), request.getQualityOfService(),request.isTurnServerActivate(),request.getTurnServerUrl(),request.getTurnServerUsername(),request.getTurnServerPassword(),request.isStunServerActivate(), request.getStunServerIp(), request.getStunServerPort(), request.getScaleInOut(),request.getScale_out_threshold());
openbatonCreateServer.setToken(token);

deploymentMap.put(appID,openbatonCreateServer);
Expand Down Expand Up @@ -397,6 +396,12 @@ else if (token.equals("PaaS Missing")){
}
}

@RequestMapping(value = "/server-ip/", method = RequestMethod.GET)
@ResponseStatus(HttpStatus.OK)
public String getMediaServerIp() {
return paaSProperties.getInternalURL();
}

@RequestMapping(value = "/openbaton/{id}", method = RequestMethod.POST, consumes = MediaType.APPLICATION_JSON_VALUE)
public void startOpenshiftBuild(@RequestBody OpenbatonEvent evt, @PathVariable("id") String id) throws UnauthorizedException{
logger.debug("starting callback for appId" + id);
Expand Down Expand Up @@ -455,7 +460,7 @@ public void startOpenshiftBuild(@RequestBody OpenbatonEvent evt, @PathVariable("
logger.debug("cloudRepositoryPort "+ cloudRepositoryPort + " IP " + cloudRepositoryIp);

try {
route = osmanager.buildApplication(server.getToken(), app.getAppID(), app.getAppName(), app.getProjectName(), app.getGitURL(), ports, targetPorts, app.getProtocols().toArray(new String[0]), app.getReplicasNumber(), app.getSecretName(), vnfrID, paaSProperties.getVnfmIP(), paaSProperties.getVnfmPort(), cloudRepositoryIp, cloudRepositoryPort, cdnServerIp);
route = osmanager.buildApplication(server.getToken(), app.getAppID(), app.getAppName(), app.getProjectName(), app.getGitURL(), ports, targetPorts, app.getProtocols().toArray(new String[0]), app.getReplicasNumber(), app.getSecretName(), vnfrID, paaSProperties.getVnfmIP(), paaSProperties.getVnfmPort(), cloudRepositoryIp, cloudRepositoryPort);

} catch (ResourceAccessException e){
obmanager.deleteDescriptor(server.getNsdID());
Expand Down
120 changes: 31 additions & 89 deletions src/main/resources/static/js/controllers/applicationController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,20 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro

var url = $cookieStore.get('URLNb') + '/api/v1/nubomedia/paas/app/';
var urlPK = $cookieStore.get('URLNb') + '/api/v1/nubomedia/paas/';
//var urlMediaManager = 'http://80.96.122.73:9000/vnfr/';
var urlMediaManager = 'http://localhost:9000/vnfr/';
var urlMediaManager = 'http://80.96.122.73:9000/vnfr/';

if (angular.isUndefined($cookieStore.get('server-ip'))) {
http.get($cookieStore.get('URLNb') + '/api/v1/nubomedia/paas/server-ip/')
.success(function (data) {
var serverIpString = data.toString();
var ip = serverIpString.substring(0, serverIpString.length - 6);
console.log(ip);
urlMediaManager = ip + ':9000/vnfr/';
$cookieStore.put('server-ip', ip);
});
}


$scope.pods=['aAaaa','bdddd'];
$scope.alerts = [];
$scope.apllications = [];
$scope.flavors = ["MEDIUM", "LARGE"];
Expand Down Expand Up @@ -33,84 +43,6 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro
$('#modalT').modal('show');
};

$scope.myData = [];
$scope.myChartOptions = {};

//
// Standard Chart Example
//

$scope.dataset = [{data: [], yaxis: 1, label: 'sin'}];
$scope.options = {
legend: {
container: '#legend',
show: true
}
};

for (var i = 0; i < 14; i += 0.5) {
$scope.dataset[0].data.push([i, Math.floor((Math.random() * 6) + 1)]);
}

//
// Categories Example
//

$scope.categoriesDataset = [[['January', 10], ['February', 8], ['March', 4], ['April', 13], ['May', 17], ['June', 9]]];
$scope.categoriesOptions = {
series: {
bars: {
show: true,
barWidth: 0.6,
align: 'center'
}
},
xaxis: {
mode: 'categories',
tickLength: 0
}
};

//
// Pie Chart Example
//

$scope.pieDataset = [];
$scope.pieOptions = {
series: {
pie: {
show: true
}
}
};

var pieSeries = Math.floor(Math.random() * 6) + 3;

for (i = 0; i < pieSeries; i++) {
$scope.pieDataset[i] = {
label: 'Series' + (i + 1),
data: Math.floor(Math.random() * 100) + 1
};
}

//
// Event example
//

$scope.eventDataset = angular.copy($scope.categoriesDataset);
$scope.eventOptions = angular.copy($scope.categoriesOptions);
$scope.eventOptions.grid = {
clickable: true,
hoverable: true
};

$scope.onEventExampleClicked = function (event, pos, item) {
alert('Click! ' + event.timeStamp + ' ' + pos.pageX + ' ' + pos.pageY);
};

$scope.onEventExampleHover = function (event, pos, item) {
console.log('Hover! ' + event.timeStamp + ' ' + pos.pageX + ' ' + pos.pageY);
};

$http.get('json/infos.json')
.then(function (res) {
Expand Down Expand Up @@ -283,7 +215,7 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro

$scope.loadAppLog = function (podName) {
console.log(podName);
http.get(url + $routeParams.applicationId + '/logs/'+ podName)
http.get(url + $routeParams.applicationId + '/logs/' + podName)
.success(function (response) {

$scope.log = $sce.trustAsHtml(n2br(response));
Expand Down Expand Up @@ -429,11 +361,10 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro
drawGraph('capacityFlot');
loadMediaManeger()
}
//$(window).resize(function() {$.plot($('#graph_div'));});
};

$scope.vnfrId;
$scope.numberValue = 0;
$scope.numberValue = 1;
$scope.loadValue = 0;
function loadMediaManeger() {
http.get(urlMediaManager)
Expand Down Expand Up @@ -467,8 +398,9 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro
});
if (type === 'number')
return $scope.numberValue;
else
else {
return $scope.loadValue;
}
}


Expand Down Expand Up @@ -507,16 +439,26 @@ angular.module('app').controller('applicationsCtrl', function ($scope, http, $ro
delete options.shaded;
}
if (id === 'capacityFlot') {
options.dataAxis.left.range.max= 100;
options.dataAxis.left.range.max = 100;
}

var graph2d = new vis.Graph2d(container, dataset, options);

function y(x) {
if (id === 'capacityFlot')
return getValue('load');
else
if (id === 'capacityFlot') {
var value = getValue('load');
//value = (Math.floor((Math.random() * 1000) + 1));
if (value > options.dataAxis.left.range.max) {
options.dataAxis.left.range.max = value;
console.log(value);
graph2d.setOptions(options);
}
return value;

}
else {
return getValue('number');
}
//return (Math.floor((Math.random() * 6) + 1));
}

Expand Down

0 comments on commit 546ae41

Please sign in to comment.