Tehran and Washington have agreed to restore the 2015 nuclear deal and will announce terms in two to three weeks, a former IAEA official told Iran International.